acts_as_enumeration 0.0.1 → 0.1.5

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in acts_as_enum.gemspec
+# Specify your gem's dependencies in acts_as_enumeration.gemspec
 gemspec

data/README

@@ -0,0 +1 @@
+This file was created by JetBrains RubyMine 5.4.2 for binding GitHub repository

data/README.md

@@ -1,6 +1,6 @@
-# ActsAsEnum
+# ActsAsEnumeration
 
-acts_as_enumerable and its aliases acts_as_enum, enumerable_column and enum_column
+acts_as_enumeration and its aliases acts_as_enumerable, acts_as_enum, enumerable_column and enum_column
 allow for unique names in a database column to behave as if they were enumerated
 types, including chaining etc.
 
@@ -8,7 +8,7 @@ types, including chaining etc.
 
 Add this line to your application's Gemfile:
 
-    gem 'acts_as_enum'
+    gem 'acts_as_enumeration'
 
 And then execute:
 
@@ -16,13 +16,13 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install acts_as_enum
+    $ gem install acts_as_enumeration
 
 ## Usage
 
 So if a database table had a column called "name", declaring
 
-   acts_as_enumerable :name
+   acts_as_enumeration :name
 
 would select all of the items in that column and map them in a hash to their
 primary key values.
@@ -41,8 +41,8 @@ as is_paul_or_michael_or_luke? which has the same effect as
 is_not_paul_or_michael_or_like which has the same effect as
 !(is_paul || is_michael? || is_luke?) or !is?(:paul, :michael, :luke)
 
-CAVEAT: due to the mechanism that the method_missing uses in is someone actually
-had the name "not bruce", the combinations cannot use this as the first element.
+CAVEAT: Due to the mechanism that the method_missing uses, if someone actually
+had the name "not bruce", the combination query cannot use this as the first element.
 i.e. "not <anything>" not just "not bruce".
 
 So a combination of is_not_bruce_or_paul? would have to be written

data/acts_as_enumeration.gemspec

@@ -1,22 +1,22 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
+require File.dirname(__FILE__) + '/lib/active_record/acts/enumeration'
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'acts_as_enumeration/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'acts_as_enumeration'
-  spec.version       = ActsAsEnumeration::VERSION
-  spec.authors       = ['Paul McKibbin']
-  spec.email         = ['pmckibbin@gmail.com']
+  spec.name = 'acts_as_enumeration'
+  spec.version = ActiveRecord::Acts::Enumeration::VERSION
+  spec.authors = ['Paul McKibbin']
+  spec.email = ['pmckibbin@gmail.com']
 
-  spec.description   = %q(Active Record extender to enable the selection of a database column and have all of it's values enumerable)
-  spec.summary       = %q(enumerable values from database columns)
-  spec.homepage      = "http://blackrat.org"
-  spec.license       = "MIT"
+  spec.description = %q(Active Record extender to enable the selection of a database column and have all of it's values enumerable)
+  spec.summary = %q(enumerable values from database columns)
+  spec.homepage = "http://blackrat.org"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/init.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'lib', 'acts_as_enumeration')

data/lib/active_record/acts/enumeration.rb

@@ -0,0 +1,107 @@
+module ActiveRecord
+  module Acts
+    module Enumeration
+      VERSION='0.1.5'
+      class << self
+        def included(base)
+          base.class_eval do
+            extend ClassMethods
+          end
+        end
+      end
+
+      def method_missing(method_id, *args, &block)
+        method_name=method_id.to_s
+        if match_data=method_name.match(/^(is(?:_not)*)(\?|_(\w*)\?)/)
+          method=match_data[1] << "?"
+          new_args= ((match_data[2]=='?') ? args : match_data[3].split(/_or_/).map { |x| x.intern })
+          respond_to?(method) ? send(method, *new_args, &block) : false
+        else
+          super
+        end
+      end
+
+
+      module ClassMethods
+        def normalize(field)
+          field.to_s.gsub(/[\\W]+/, ' ').strip.gsub(/\s+/, '_').underscore
+        end
+
+        def acts_as_enumeration(*opts)
+          opts.each do |field|
+            klass=self
+            (
+            class<<self;
+              self;
+            end).class_eval do
+              define_method "enum_#{field}" do
+                instance_variable_get("@enum_#{field}") || instance_variable_set("@enum_#{field}", HashWithIndifferentAccess[*klass.all.map { |x| [x.send(field).gsub(/[\\W]+/, ' ').strip.gsub(/\s+/, '_').underscore, x.send(x.class.primary_key)] }.flatten])
+              end
+
+              define_method :as_key do |value|
+                return '' unless exists?(value)
+                klass.find(value).as_key
+              end
+
+              alias_method :as_symbol, :as_key
+
+              define_method "valid_#{field}?" do |value|
+                send("enum_#{field}").has_key?(value)
+              end
+
+              define_method "id_for_#{field}" do |value|
+                send("enum_#{field}")[value]
+              end
+
+              define_method "for_#{field}" do |value|
+                klass.find(send("id_for_#{field}", value))
+              end
+            end
+
+            define_method 'is?' do |*types|
+              types.any? { |x| send(self.class.primary_key)==self.class.send("enum_#{field}")[x] }
+            end
+
+            define_method 'is_not?' do |*types|
+              !is?(*types)
+            end
+
+            define_method :as_key do
+              self.class.normalize(send(field)).intern
+            end
+
+            alias_method :as_symbol, :as_key
+
+            all.map { |x| normalize(x.send(field)) }.each do |y|
+
+              define_method "is_#{y}?" do
+                is?("#{y}")
+              end
+
+              identifier = y.to_s=~/^[a-z_]/ ? y.to_s : "_#{y.to_s}"
+
+              define_method "#{identifier}?" do
+                is?("#{y}")
+              end
+
+              (
+              class << self;
+                self;
+              end).class_eval do
+                define_method identifier do
+                  self.send("for_#{field}", y)
+                end
+              end
+            end
+          end
+        end
+
+        [:acts_as_enum, :enum_column, :enumerable_column, :acts_as_enumerable].each do |aliased|
+          unless defined?(aliased)
+            alias_method :aliased, :acts_as_enumeration
+          end
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_enumeration.rb

@@ -1,6 +1,2 @@
-require 'acts_as_enumeration/version'
-require 'acts_as_enumeration/enumerable'
-
-class ActiveRecord::Base
-  extend ActsAsEnumeration
-end
+require_relative File.join('active_record', 'acts', 'enumeration.rb')
+ActiveRecord::Base.send :include, ActiveRecord::Acts::Enumeration

data/test/enumeration_test.rb

@@ -0,0 +1,80 @@
+require 'rubygems'
+if RUBY_VERSION >= '1.9'
+  require 'minitest/autorun'
+  require 'active_record'
+else
+  require 'test/unit'
+  require 'activerecord'
+  require 'sqlite3'
+end
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require File.dirname(__FILE__) + '/../acts_as_enumeration'
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+
+def setup_db
+  ActiveRecord::Base.logger
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :enumerates do |t|
+      t.column :type, :string
+      t.column :name, :string
+      t.column :description, :string
+    end
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class Enumerate < ActiveRecord::Base;
+end
+class EnumerateAll < Enumerate;
+end
+
+class EnumerateTest < (
+begin
+  MiniTest::Test rescue Test::Unit::TestCase
+end)
+  def setup
+    setup_db
+    [EnumerateAll].each do |klass|
+      klass.create! :name => 'first', :description => 'First field'
+      klass.create! :name => 'second', :description => 'Second field'
+      klass.create! :name => 'third', :description => 'Third field'
+      klass.create! :name => 'forth', :description => 'Forth field'
+      klass.create! :name => 'fifth', :description => 'Fifth field'
+      klass.create! :name => 'sixth', :description => 'Sixth field'
+    end
+    Enumerate.acts_as_enumeration :description
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_basics
+    assert Enumerate.first.is?(:first_field)
+    assert Enumerate.first.is?('first_field')
+    assert Enumerate.first.is_not?(:second_field)
+    assert Enumerate.first.is?(:first_field, :second_field)
+    assert Enumerate.first.is_not?(:second_field, :third_field)
+    assert Enumerate.first.is_first_field?
+    assert Enumerate.first.is_not_second_field?
+    assert Enumerate.first.is_first_field_or_second_field?
+    assert Enumerate.second_field.is_first_field_or_second_field?
+    assert Enumerate.second_field.is_not_first_field?
+    assert Enumerate.first.first_field?
+    assert_equal Enumerate.first, Enumerate.first_field
+    assert_equal(:first_field, Enumerate.first.as_key)
+    assert_equal(:first_field, Enumerate.as_key(Enumerate.first.id))
+    assert Enumerate.valid_description?(:first_field)
+    assert Enumerate.valid_description?('first_field')
+    assert !Enumerate.valid_description?(:blah_blah_field)
+    assert !Enumerate.valid_description?('blah_blah_field')
+    assert Enumerate.first.id, Enumerate.id_for_description(:first_field)
+  end
+end
+

metadata

@@ -1,88 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: acts_as_enumeration
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
-authors:
+authors: 
 - Paul McKibbin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2016-03-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Active Record extender to enable the selection of a database column and
-  have all of it's values enumerable
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Active Record extender to enable the selection of a database column and have all of it's values enumerable
+email: 
 - pmckibbin@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE.txt
+- README
 - README.md
 - Rakefile
 - acts_as_enumeration.gemspec
+- init.rb
+- lib/active_record/acts/enumeration.rb
 - lib/acts_as_enumeration.rb
-- lib/acts_as_enumeration/enumerable.rb
-- lib/acts_as_enumeration/version.rb
+- test/enumeration_test.rb
 homepage: http://blackrat.org
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_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"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: enumerable values from database columns
-test_files: []
+test_files: 
+- test/enumeration_test.rb

data/lib/acts_as_enumeration/enumerable.rb

@@ -1,100 +0,0 @@
-module ActsAsEnumeration
-  def acts_as_enumerable(*args)
-    args.each do |column_name|
-
-      class_eval(%Q(
-        unless defined? @@enum_#{column_name}
-          @@enum_#{column_name}=Hash[*all.map{|x| [x.send(column_name).gsub(/[\\W]+/,' ').strip.gsub(/\s+/,'_').underscore.intern,x.send(x.class.primary_key)]}.flatten]
-        end
-      ), __FILE__, __LINE__+1)
-
-      all.map { |x| x.send(column_name).gsub(/[\W]+/, ' ').strip.gsub(/\s+/, '_').underscore.intern }.each do |y|
-        class_eval(%Q(
-          def is_#{y}?
-            is?("#{y}".intern)
-          end
-                   ), __FILE__, __LINE__+1)
-
-        identifier = y.to_s=~/^[a-z_]/ ? y.to_s : "_#{y.to_s}"
-        class_eval(%Q(
-          def #{identifier}?
-            is_#{y}?
-          end
-                   ), __FILE__, __LINE__+1)
-
-        class_eval(%Q(
-          def self.#{identifier}
-            for_#{column_name}("#{y}".intern)
-          end
-                   ), __FILE__, __LINE__+1)
-      end
-
-      class_eval(%Q(
-        def self.enum_#{column_name}
-          @@enum_#{column_name}
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def self.as_key(value)
-          return nil unless exists?(value)
-          find(value).as_key
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def self.valid_#{column_name}?(value)
-          @@enum_#{column_name}.keys.include?(value)
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def self.id_for_#{column_name}(value)
-          @@enum_#{column_name}[value]
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def self.for_#{column_name}(value)
-          find(id_for_#{column_name}(value))
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def is?(*types)
-          types.any?{|x| send(self.class.primary_key)==self.class.enum_#{column_name}[x]}
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def is_not?(*types)
-          !is?(*types)
-        end
-      ), __FILE__, __LINE__+1)
-
-      class_eval(%Q(
-        def as_key
-          #{column_name}.gsub(/[\\W]+/,' ').strip.gsub(/\s+/,'_').underscore.intern
-        end
-        alias_method :as_symbol, :as_key
-                 ))
-
-      class_eval(%Q(
-        def method_missing(method_id, *args, &block)
-          method_name=method_id.to_s
-          if match_data=method_name.match(/^(is[_not]*)(\\?|_(\\w*)\\?)/)
-            method=match_data[1] << "?"
-            new_args= ((match_data[2]=='?') ? args : match_data[3].split(/_or_/).map{|x| x.intern})
-            respond_to?(method) ? send(method,*new_args,&block) : false
-          else
-            super
-          end
-        end
-       ), __FILE__, __LINE__+1)
-    end
-  end
-
-  alias_method :acts_as_enumeration, :acts_as_enumerable
-  alias_method :enumerable_column, :acts_as_enumerable
-  alias_method :enum_column, :acts_as_enumerable
-end

data/lib/acts_as_enumeration/version.rb

@@ -1,3 +0,0 @@
-module ActsAsEnumeration
-  VERSION = "0.0.1"
-end