publishing_logic 0.2.0 → 0.3.0

data/lib/publishing_logic/model_logic.rb

@@ -0,0 +1,51 @@
+module PublishingLogic
+  module ModelLogic
+    def self.included(base)
+      base.class_eval do
+        validates_presence_of :published_at, if: :publishing_enabled?
+        validate :published_until_is_not_before_published_at
+        validate :publishing_until_in_future
+
+        # If objects have identical published_at values, order by created_at. If these are
+        # identical as well, then order by id. This is done to ensure there is a unique
+        # ordering of objects, ordering by newest and oldest should result in arrays that are
+        # the inverse of the other.
+        scope :by_publication_date_oldest_first, lambda {
+          order("#{base.table_name}.published_at ASC, #{base.table_name}.created_at ASC, #{base.table_name}.id ASC")
+        }
+
+        scope :by_publication_date_newest_first, lambda {
+          order("#{base.table_name}.published_at DESC, #{base.table_name}.created_at DESC, #{base.table_name}.id DESC")
+        }
+
+        scope :published, lambda { where("#{base.table_name}.publishing_enabled = ? AND \
+                                          (#{base.table_name}.published_until IS NULL or #{base.table_name}.published_until > ?) AND \
+                                          (#{base.table_name}.published_at IS NULL or #{base.table_name}.published_at < ?)",
+                                          true, Time.now.utc, Time.now.utc) } do
+          def newest
+            order("#{table_name}.published_at DESC").first
+          end
+
+          def oldest
+            order("#{table_name}.published_at DESC").last
+          end
+        end
+
+        def published?
+          return false if published_at && Time.now < published_at
+          return false if published_until && Time.now > published_until
+          publishing_enabled?
+        end
+
+      private
+        def published_until_is_not_before_published_at
+          errors.add(:published_until, :must_be_before_publishing_at) if published_until.present? && published_at.present? && published_until < published_at
+        end
+
+        def publishing_until_in_future
+          errors.add(:published_until, :must_be_in_the_future) if published_until && !published_until.future?
+        end
+      end
+    end
+  end
+end

data/lib/publishing_logic/version.rb

@@ -0,0 +1,3 @@
+module PublishingLogic
+  VERSION = "0.3.0"
+end

data/publishing_logic.gemspec

@@ -0,0 +1,29 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'publishing_logic/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "publishing_logic"
+  spec.version       = PublishingLogic::VERSION
+  spec.authors       = ["Unboxed Consulting", "Attila Györffy"]
+  spec.email         = ["enquiries@unboxedconsulting.com"]
+
+  spec.summary       = %q{Publishing logic for ActiveRecord models}
+  spec.description   = %q{Publishing logic for ActiveRecord models}
+  spec.homepage      = "https://github.com/unboxed/publishing_logic"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'activerecord', ">= 3.0.0"
+
+  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'database_cleaner', ">= 0.5.0"
+  spec.add_development_dependency 'sqlite3'
+end

metadata

@@ -1,211 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: publishing_logic
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Unboxed Consulting
+- Attila Györffy
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-
-date: 2010-08-20 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2016-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Publishing logic for ActiveRecord models
-email: enquiries@unboxedconsulting.com
+email:
+- enquiries@unboxedconsulting.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
-- .gitignore
-- .specification.example
+extra_rdoc_files: []
+files:
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".specification.example"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
+- Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
-- lib/model_logic.rb
+- bin/console
+- bin/setup
+- lib/generators/publishing_logic/fields_generator.rb
+- lib/generators/publishing_logic/templates/migration.erb
+- lib/locale/en.yml
+- lib/locale/hu.yml
 - lib/publishing_logic.rb
-- rails_generators/publishing_logic_fields/USAGE
-- rails_generators/publishing_logic_fields/publishing_logic_fields_generator.rb
-- rails_generators/publishing_logic_fields/templates/app/views/publishing_logic_fields.html.erb
-- rails_generators/publishing_logic_fields/templates/db/migrate/add_publishing_logic_fields.rb.erb
-- spec/general_model_logic.rb
-- spec/models_with_all_fields_spec.rb
-- spec/models_with_no_published_until_field_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/database_cleanliness.rb
-- spec/support/database_connection.rb
-- spec/support/database_migrations.rb
-- spec/support/factories.rb
-- spec/support/logging.rb
-- spec/support/models/article.rb
-- spec/support/models/programme.rb
-has_rdoc: true
-homepage: http://github.com/unboxed/publishing_logic
-licenses: []
-
+- lib/publishing_logic/model_logic.rb
+- lib/publishing_logic/version.rb
+- publishing_logic.gemspec
+homepage: https://github.com/unboxed/publishing_logic
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Publishing logic for ActiveRecord models
-test_files: 
-- spec/general_model_logic.rb
-- spec/models_with_all_fields_spec.rb
-- spec/models_with_no_published_until_field_spec.rb
-- spec/spec_helper.rb
-- spec/support/database_cleanliness.rb
-- spec/support/database_connection.rb
-- spec/support/database_migrations.rb
-- spec/support/factories.rb
-- spec/support/logging.rb
-- spec/support/models/article.rb
-- spec/support/models/programme.rb
+test_files: []

data/README.rdoc

@@ -1,29 +0,0 @@
-= publishing_logic
-
-Publishing logic for ActiveRecord models
-* Generates a migration with fields required for publishing
-  logic. Fields are:
-  * publishing_enabled:boolean
-  * published_at:datetime
-  * published_until:datetime (optional)
-* Defines logic on models that include PublishingLogic::ModelLogic
-  * published named scope
-  * published? method
-  * ordering by published_at
-
-The source for this gem can be found on http://github.com/unboxed/publishing_logic
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2009 Unboxed Consulting and Channel 5 Broadcasting Ltd. See LICENSE for details.

data/VERSION

@@ -1 +0,0 @@
-0.2.0

data/lib/model_logic.rb

@@ -1,82 +0,0 @@
-module PublishingLogic
-  module ModelLogic
-
-    def self.included(base)
-      module_to_include = if base.column_names.include?('published_until')
-                            WithPublishedUntilField
-                          else
-                            WithoutPublishedUntilField
-                          end
-      base.class_eval do
-        # If objects have identical published_at values, order by created_at. If these are
-        # identical as well, then order by id. This is done to ensure there is a unique
-        # ordering of objects, ordering by newest and oldest should result in arrays that are
-        # the inverse of the other.
-        named_scope :by_publication_date_oldest_first, :order => "#{base.table_name}.published_at ASC, #{base.table_name}.created_at ASC, #{base.table_name}.id ASC"
-        named_scope :by_publication_date_newest_first, :order => "#{base.table_name}.published_at DESC, #{base.table_name}.created_at DESC, #{base.table_name}.id DESC"
-
-        include module_to_include
-
-        class << self
-          def by_date_oldest_first
-            ::ActiveSupport::Deprecation.warn("by_date_oldest_first is deprecated and will be removed in the next version of this gem (use by_publication_date_oldest_first instead, it's more intention revealing).", caller)
-            by_publication_date_oldest_first
-          end
-
-          def by_date_newest_first
-            ::ActiveSupport::Deprecation.warn("by_date_newest_first is deprecated and will be removed in the next version of this gem (use by_publication_date_newest_first instead, it's more intention revealing).", caller)
-            by_publication_date_newest_first
-          end
-        end
-      end
-    end
-
-    module WithoutPublishedUntilField
-      def self.included(base)
-        base.class_eval do
-          named_scope :published, lambda {{ :conditions => ["#{base.table_name}.publishing_enabled = ? AND \
-                                            (#{base.table_name}.published_at is null or #{base.table_name}.published_at < ?)",
-                                            true, Time.now.utc] }} do
-            def newest
-              find(:first, :order => "#{proxy_scope.table_name}.published_at DESC")
-            end
-
-            def oldest
-              find(:last, :order => "#{proxy_scope.table_name}.published_at DESC")
-            end
-          end
-
-          def published?
-            return false if published_at && Time.now < published_at
-            publishing_enabled?
-          end
-        end
-      end
-    end
-
-    module WithPublishedUntilField
-      def self.included(base)
-        base.class_eval do
-          named_scope :published, lambda {{ :conditions => ["#{base.table_name}.publishing_enabled = ? AND \
-                                            (#{base.table_name}.published_until is null or #{base.table_name}.published_until > ?) AND \
-                                            (#{base.table_name}.published_at is null or #{base.table_name}.published_at < ?)",
-                                            true, Time.now.utc, Time.now.utc] }} do
-            def newest
-              find(:first, :order => "#{proxy_scope.table_name}.published_at DESC")
-            end
-
-            def oldest
-              find(:last, :order => "#{proxy_scope.table_name}.published_at DESC")
-            end
-          end
-
-          def published?
-            return false if published_at && Time.now < published_at
-            return false if published_until && Time.now > published_until
-            publishing_enabled?
-          end
-        end
-      end
-    end
-  end
-end