power_enum 1.4.0 → 2.0.0.rc

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmI3NzljN2JiODEzOTQyOWMxMDk0N2ZjYjQ5ZGUwOTIwMmMyNWRkZA==
+    M2Q1NDg3Yzc2MDU2NjZmM2VlNDUwZWVhNTMxMTAyMzA5M2M0MDgwOQ==
   data.tar.gz: !binary |-
-    NjAzMjkzYzg0YTJjNmEyYjIyYTExNjJkMWU3NmRlYjg3ZWFiZjgxNw==
+    NDlkMWUzNTlkNDM1NWQ5YmEyNzk3Y2M0NzY3MzM5NWNlNWJiYjMzOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjI5NDI4NWU2NDJiNTY5ZjY5NTc5YmU4NWQ5ODRmMDY5OWY3NTU0ZTZkMWVi
-    YTA3ODBjMmNmOTBkMzEzZGJiM2MzOTY2YmE5MTA4MjI2NmEyODk5MWFhYTky
-    MTkwY2RlZmRmYTZjODJkOWI1MDQ2NDkxYmFmOTY0ZmU4ZWNkOTU=
+    MzkzZTAyNGIwNGExMWIzMzhhNzBlNWYzNmZlMWYwMzA3MzQyN2ZmYmVlNTA1
+    MWNkZjNiYjYxYzk3NzMyNjkxMDQyNDM1ZDU0ZjEwMTliNjhiNjhhZDlmNzdj
+    ZTQ4YmQ2NTI0NThlYTZiMDQyODY3ZTQ1NTFiNzg0ZjBjODk5ZDE=
   data.tar.gz: !binary |-
-    ZWUwOTY5NTM5NjVkZjNjMjhmMjAwYzkyMTllMTcwZDFjY2Q0YmYxNDkwMjY1
-    NGZmYzRiZjMyMjdiMDY3OTRmYjA0NzVjMThiY2YzNDgzNzE1NWE5YzVlMjU0
-    MDgxN2Y3OGJmODAxMDFhZGMyOTBlNGIwMDFlN2FhYWMyNjY1NzU=
+    ZTM4OWI0NWQ5MjBmYThkYTlmZjVkYzVkM2JkMjE2MWRjNjY0NzRmNzM5ODdk
+    MTEzMmU4NGQzOTM4MjNhNDJmNGE1NTIwNTdiZWY1NTc5YTFhYWQ1YWFiNTgy
+    YzUwODNmZTM4MmQ3ODQ2NzU0Mzg3YjI2NDNjM2M4NTRmYzA5MDQ=

data/README.markdown

@@ -1,19 +1,16 @@
 # Power Enum
 
-https://github.com/albertosaurus/power_enum
+https://github.com/albertosaurus/power_enum_2
 
-[![Build Status](https://travis-ci.org/albertosaurus/power_enum.png)](https://travis-ci.org/albertosaurus/power_enum)
-[![Code Climate](https://codeclimate.com/github/albertosaurus/power_enum.png)](https://codeclimate.com/github/albertosaurus/power_enum)
+[![Build Status](https://travis-ci.org/albertosaurus/power_enum_2.png)](https://travis-ci.org/albertosaurus/power_enum_2)
+[![Code Climate](https://codeclimate.com/github/albertosaurus/power_enum_2.png)](https://codeclimate.com/github/albertosaurus/power_enum_2)
 
-Enumerations for Rails 3.1/3.2 Done Right.
+Enumerations for Rails 4 Done Right.
 
 ## Versions
 
-* PowerEnum 1.X  (this version) supports Rails 3.1/3.2.
-* PowerEnum 2.X supports Rails 4, available here: https://github.com/albertosaurus/power_enum_2
-
-NOTICE: Version 1.0 removes support from Rails 3.0, as that version of Rails has no longer been supported for
-some time. The last version to support Rails 3.0 was 0.11.1.
+* PowerEnum 2.X (this version) supports Rails 4.
+* PowerEnum 1.X supports Rails 3.1/3.2, available here: https://github.com/albertosaurus/power_enum
 
 ## What is this?:
 
@@ -31,6 +28,8 @@ At it's most basic level, it allows you to say things along the lines of:
 ```ruby
 # Create a provisional booking
 booking = Booking.new( :status => BookingStatus[:provisional] )
+# This also works
+booking = Booking.new( :status => :provisional )
 # Set the booking status to 'confirmed'
 booking.status = :confirmed
 booking = Booking.create( :status => :rejected )
@@ -50,14 +49,16 @@ See "How to use it" below for more information.
 
 ## Requirements
 
-* Ruby 1.8.7, 1.9.2, 1.9.3, JRuby 1.6+ (Ruby 1.9.3 required for development)
-* Rails 3.1, 3.2
+### PowerEnum 2.X
+
+* Ruby 1.9.3, 2.0, JRuby 1.7+ (Ruby 1.9.3 or 2.0 required for development)
+* Rails 4.0
 
 ## Installation
 
 ### READ THIS FIRST
 
-Starting with version 1.1.0, the gem is signed. The public key is available
+This gem is signed. The public key is available
 here: https://github.com/albertosaurus/power_enum (look for gem-public\_cert.pem). Hence, if
 you can get an error like the following if you're installing in `HighSecurity` mode.
 

data/lib/generators/enum/enum_generator.rb

@@ -2,12 +2,12 @@
 # Released under the MIT license.  See LICENSE for details.
 
 # Generator for PowerEnum
-class EnumGenerator < Rails::Generators::NamedBase
+class EnumGenerator < Rails::Generators::Base
   require File.expand_path('../enum_generator_helpers/migration_number', __FILE__)
-  include Rails::Generators::Migration
-  extend EnumGeneratorHelpers::MigrationNumber
+  include EnumGeneratorHelpers::MigrationNumber
 
   source_root File.expand_path('../templates', __FILE__)
+  argument :enum_name, :type => :string
   class_option :migration, :type => :boolean, :default => true, :desc => 'Generate migration for the enum'
   class_option :fixture, :type => :boolean, :default => false, :desc => 'Generate fixture for the enum'
 
@@ -18,17 +18,45 @@ class EnumGenerator < Rails::Generators::NamedBase
 
   # Generates the migration to create the enum table.
   def generate_migration
-    migration_template 'rails31_migration.rb.erb', "db/migrate/create_enum_#{table_name}.rb" if options.migration?
-  end
-
-  # Do not pluralize enumeration names
-  def pluralize_table_names?
-    false
+    template migration_template, "db/migrate/#{migration_file_name}.rb" if options.migration?
   end
 
   hook_for :test_framework, :as => :model do |enum_generator_instance, test_generator_class|
     # Need to do this because I'm changing the default value of the 'fixture' option.
-    table_name = enum_generator_instance.send(:table_name)
-    enum_generator_instance.invoke( test_generator_class, [table_name], { 'fixture' => enum_generator_instance.options.fixture? } )
+    enum_generator_instance.invoke( test_generator_class, [enum_generator_instance.enum_name], { 'fixture' => enum_generator_instance.options.fixture? } )
+  end
+  
+  no_tasks do
+
+    # Returns the file name of the enum model without the .rb extension.
+    def file_name
+      enum_name.underscore
+    end
+
+    # Returns the class name of the enum.
+    def enum_class_name
+      file_name.camelize
+    end
+
+    # Derives the name for the migration, something like 'create_enum_fruit'
+    def migration_name
+      "create_enum_#{file_name}"
+    end
+
+    # Returns the class name of our migration
+    def migration_class_name
+      migration_name.camelize
+    end
+
+    # Generates and returns the filename of our migration
+    def migration_file_name
+      "#{next_migration_number}_#{migration_name}"
+    end
+
+    # Returns the name of the template file for the migration.
+    def migration_template
+      'rails31_migration.rb.erb'
+    end
+
   end
 end

data/lib/generators/enum/enum_generator_helpers/migration_number.rb

@@ -2,13 +2,23 @@
 module EnumGeneratorHelpers
   # Helper methods to figure out the migration number.
   module MigrationNumber
+
+    # Returns the number of the last migration.
+    # @return [Fixnum]
+    def current_migration_number
+      dirname = "#{Rails.root}/db/migrate/[0-9]*_*.rb"
+      Dir.glob(dirname).collect do |file|
+        File.basename(file).split("_").first.to_i
+      end.max.to_i
+    end
+
     # Returns the next upcoming migration number.  Sadly, Rails has no API for
     # this, so we're reduced to copying from ActiveRecord::Generators::Migration
     # @return [Fixnum]
-    def next_migration_number(dirname)
+    def next_migration_number
       # Lifted directly from ActiveRecord::Generators::Migration
       # Unfortunately, no API is provided by Rails at this time.
-      next_migration_number = current_migration_number(dirname) + 1
+      next_migration_number = current_migration_number + 1
       if ActiveRecord::Base.timestamped_migrations
         [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
       else
@@ -17,4 +27,4 @@ module EnumGeneratorHelpers
     end
 
   end
-end
+end

data/lib/generators/enum/templates/model.rb.erb

@@ -1,3 +1,3 @@
-class <%= class_name %> < ActiveRecord::Base
+class <%= enum_class_name %> < ActiveRecord::Base
   acts_as_enumerated
 end

data/lib/power_enum/enumerated.rb

@@ -83,12 +83,34 @@ module PowerEnum::Enumerated
       self.acts_enumerated_name_column = get_name_column(options)
 
       unless self.is_a? PowerEnum::Enumerated::EnumClassMethods
+        preserve_query_aliases
         extend_enum_class_methods( options )
       end
     end
 
+    # Rails 4 delegates all the finder methods to 'all'. PowerEnum overrides 'all'. Hence,
+    # the need to re-alias the query methods.
+    def preserve_query_aliases
+      class << self
+        alias_method :__all, :all
+
+        # From ActiveRecord::Querying
+        delegate :find, :take, :take!, :first, :first!, :last, :last!, :exists?, :any?, :many?, :to => :__all
+        delegate :first_or_create, :first_or_create!, :first_or_initialize, :to => :__all
+        delegate :find_or_create_by, :find_or_create_by!, :find_or_initialize_by, :to => :__all
+        delegate :find_by, :find_by!, :to => :__all
+        delegate :destroy, :destroy_all, :delete, :delete_all, :update, :update_all, :to => :__all
+        delegate :find_each, :find_in_batches, :to => :__all
+        delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins,
+                 :where, :preload, :eager_load, :includes, :from, :lock, :readonly,
+                 :having, :create_with, :uniq, :distinct, :references, :none, :unscope, :to => :__all
+        delegate :count, :average, :minimum, :maximum, :sum, :calculate, :pluck, :ids, :to => :__all
+      end
+    end
+
     # Injects the class methods into model
     def extend_enum_class_methods(options) #:nodoc:
+
       extend PowerEnum::Enumerated::EnumClassMethods
 
       class_eval do

data/lib/power_enum/reflection.rb

@@ -47,7 +47,7 @@ module PowerEnum::Reflection
 
     # See ActiveRecore::Reflection::MacroReflection
     def initialize( name, options, active_record )
-      super :has_enumerated, name, options, active_record
+      super :has_enumerated, name, nil, options, active_record
     end
 
     # Returns the class name of the enum
@@ -106,5 +106,11 @@ module PowerEnum::Reflection
       true
     end
 
+    # An array of arrays of scopes. Each item in the outside array corresponds
+    # to a reflection in the #chain.
+    def scope_chain
+      scope ? [[scope]] : [[]]
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_enum
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0.rc
 platform: ruby
 authors:
 - Trevor Squires
@@ -39,7 +39,7 @@ cert_chain:
   amZaYUtWM2wwYTFkR2wyUVNMa2pScFFaRDFiRCtVSDdnT3F5N1piZGNzUkJM
   NEg3VTV6VQpibEtkZEg2dXhDckRTTTdLYWJrelNPVmYKLS0tLS1FTkQgQ0VS
   VElGSUNBVEUtLS0tLQo=
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -163,8 +163,7 @@ files:
 - LICENSE
 - README.markdown
 homepage: http://github.com/albertosaurus/power_enum
-licenses:
-- MIT
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -177,9 +176,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -188,3 +187,4 @@ specification_version: 4
 summary: Allows you to treat instances of your ActiveRecord models as though they
   were an enumeration of values
 test_files: []
+has_rdoc: