galetahub-enum_field 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15aaf18aef53f29039a854952b1b5e44f0e4aa33
-  data.tar.gz: 4cb0b621ef38b6a5ba0ace8e8259e3b56b2872d8
+  metadata.gz: f48cb1f03e5efc4c877bc640e80d1014b3ed95f3
+  data.tar.gz: 961be9b9cca8ca6c1ded7040fdb2523fb1e24825
 SHA512:
-  metadata.gz: 759ab41e758a0a38e3186d1508a3b875a65044b3a5297ce89112231c3b7d93e80ebf7bc6072c40baaab773600460a179a0be68ccc1e1955521738c4de683bb39
-  data.tar.gz: 139d8b0a1dd4c9866d962c699ec3b3bdf47ec31b40b4637d97a98d39fbf902657107eab33aa217278c4adf444675c1506fdd16d24d58cf63b1b4d46791a6833a
+  metadata.gz: e613425fc98812bdf5e90845f90d41320e6601743805326aca4eeacdd26bcd2f9fe4c2f1614449befd42308930f5c37e58f3e6eaa6a83df752f84b368034710c
+  data.tar.gz: 8bb7032ee05e016e534b309a02525adf3c6a7b54fada56f0058615d3944cc13d633db6b46e3cd40d99fd7406e09cd96863f9824776aa5786ba40defab9a4d0cf

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Aimbulance
+Copyright 2012 Fodojo LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -42,6 +42,8 @@ If you are not confortable with any of this options, maybe +enum_field+ is an an
   end
 
   class User < ActiveRecord::Base
+    extend EnumField::EnumeratedAttribute
+
     # in the database table there is a role_id integer column
     enumerated_attribute :role
   end
@@ -65,9 +67,9 @@ Your enum classes can have all the methods you need:
     attr_reader :name
 
     define_enum do |b|
-      b.member :home,       :object => PhoneType.new('home')
-      b.member :commercial, :object => PhoneType.new('commercial')
-      b.member :mobile,     :object => PhoneType.new('mobile')
+      b.member :home,       :object => new('home')
+      b.member :commercial, :object => new('commercial')
+      b.member :mobile,     :object => new('mobile')
     end
   end
 
@@ -84,6 +86,8 @@ You have some +AR+ like methods in enum classes
   PhoneType.find(2) == PhoneType.commercial
   PhoneType.find(123456)  # will raise
 
+  PhoneType.find([1, 2]) == [PhoneType.home, PhoneType.commercial]
+
 The library also mimics has_many :through behavior, for cases such as:
 
   class Role
@@ -97,10 +101,14 @@ The library also mimics has_many :through behavior, for cases such as:
   end
 
   class User
+    extend EnumField::EnumeratedAttribute
+
     has_many_enumerated_attributes :roles, :through  => UserRole
   end
 
   class UserRole < ActiveRecord::Base
+    extend EnumField::EnumeratedAttribute
+    
     belongs_to :user
     enumerated_attribute :role
   end

data/lib/enum_field.rb

@@ -6,10 +6,11 @@ module EnumField
   autoload :Version, 'enum_field/version'
   
   class BadId < StandardError
+    attr_reader :repeated_id
+
     def initialize(repeated_id)
       @repeated_id = repeated_id
     end
-    attr_reader :repeated_id
   end
 
   class RepeatedId < StandardError; end
@@ -17,5 +18,3 @@ module EnumField
   class InvalidOptions < StandardError; end
   class ObjectNotFound < StandardError; end
 end
-
-require 'enum_field/railtie' if defined?(Rails)

data/lib/enum_field/builder.rb

@@ -1,6 +1,9 @@
 # encoding: utf-8
 module EnumField
   class Builder
+
+    METHODS = [:all, :names, :find_by_id, :find, :first, :last]
+
     def initialize(target)
       @target = target
       @next_id = 0
@@ -30,7 +33,18 @@ module EnumField
     end
 
     def find_by_id(id)
-      @id2obj[id.to_i]
+      case id
+      when Integer, String, Float, Fixnum then 
+        @id2obj[id.to_i]
+      when Array then 
+        id.inject([]) do |items, value|
+          if value && value.respond_to?(:to_i)
+            items << @id2obj[value.to_i]
+          end
+
+          items
+        end
+      end
     end
 
     def first; @sorted.first; end

data/lib/enum_field/define_enum.rb

@@ -2,8 +2,7 @@
 module EnumField
   module DefineEnum
     def self.included(base)
-      base.send :include, InstanceMethods
-      base.send :extend,  ClassMethods
+      base.send :extend, ClassMethods
     end
       
     module ClassMethods
@@ -17,17 +16,12 @@ module EnumField
         @enum_builder ||= EnumField::Builder.new(self)
         yield @enum_builder
 
-        [:all, :names, :find_by_id, :find, :first, :last].each do |method|
-          instance_eval <<-END
-            def #{method}(*args, &block)
-              @enum_builder.send(:#{method}, *args, &block)
-            end
-          END
+        EnumField::Builder::METHODS.each do |method|
+          define_singleton_method method do |*args, &block|
+            @enum_builder.send(method, *args, &block)
+          end
         end
       end
     end
-    
-    module InstanceMethods
-    end
   end
 end

data/lib/enum_field/enumerated_attribute.rb

@@ -17,10 +17,14 @@ module EnumField
   # For instance:
   # <tt>
   # class User
+  #   extend EnumField::EnumeratedAttribute
+  #
   #   has_many_enumerated_attributes :roles, :through  => UserRole
   # end
   #
   # class UserRole < ActiveRecord::Base
+  #   extend EnumField::EnumeratedAttribute
+  #
   #   belongs_to :user
   #   enumerated_attribute :role
   # end

data/lib/enum_field/version.rb

@@ -1,3 +1,3 @@
 module EnumField
-  VERSION = "0.2.2".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galetahub-enum_field
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Enables Active Record attributes to point to enum like objects, by saving
   in your database only an integer ID
@@ -22,7 +22,6 @@ files:
 - lib/enum_field/builder.rb
 - lib/enum_field/define_enum.rb
 - lib/enum_field/enumerated_attribute.rb
-- lib/enum_field/railtie.rb
 - lib/enum_field/version.rb
 - lib/enum_field.rb
 - MIT-LICENSE
@@ -37,12 +36,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/enum_field/railtie.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-require 'rails'
-require 'enum_field'
-
-module EnumField
-  class Railtie < ::Rails::Railtie
-    config.before_initialize do
-      ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.send(:extend, EnumField::EnumeratedAttribute)
-      end
-    end
-  end
-end