degu 0.0.5 → 0.1.0

data/Rakefile

@@ -22,6 +22,7 @@ GemHadar do
   development_dependency 'sqlite3'
   development_dependency 'rspec'
   development_dependency 'ruby-debug'
+  development_dependency 'rcov'
 end
 
 desc 'Run specs and tests'

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/degu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "degu"
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-12-14"
+  s.date = "2011-12-15"
   s.description = "Library that includes enums, and rails support for enums and bitfield sets."
   s.email = "dev@pkw.de"
   s.extra_rdoc_files = ["README.rdoc", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/polite.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/renum.rb", "lib/degu/rude.rb", "lib/degu/version.rb", "lib/degu.rb"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
     else
       s.add_dependency(%q<gem_hadar>, ["~> 0.1.3"])
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0"])
     end
   else
@@ -42,6 +44,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0"])
   end
 end

data/lib/degu/has_set.rb

@@ -5,7 +5,7 @@ require 'active_support'
 require 'active_record'
 module Degu
   module HasSet
-    VERSION = '0.0.4'
+    extend ActiveSupport::Concern
 
     module ClassMethods
       # Use like this:
@@ -14,105 +14,92 @@ module Degu
       #     has_set :interests
       #   end
       def has_set(set_name, options = {})
-
+        set_name_singular = set_name.to_s.singularize
         set_column = options.has_key?(:column_name) ? options[:column_name].to_s : "#{set_name}_bitfield"
 
         begin
-          enum_class = options.has_key?(:enum_class) ? options[:enum_class] : set_name.to_s.camelcase.constantize
+          enum_class = options[:class_name] || options[:enum_class] || set_name.to_s.camelcase.constantize
         rescue NameError => ne
           raise NameError, "There ist no class to take the set entries from (#{ne.message})."
         end
 
-        # Extend enum_class with field_name method
-        enum_class.class_eval <<-EOF
-          def field_name
-            '#{set_name.to_s.singularize}_' + self.name.underscore
-          end
-        EOF
-
         define_method("#{set_name}=") do |argument_value|
-          self[set_column] = 
-            unless argument_value.nil?
-              invalid_set_elements = []
-              set_elements =
-                if String === argument_value
-                  argument_value.split(',').map(&:strip)
-                else
-                  Array(argument_value)
-                end.map do |set_element|
-                  if result = enum_class[set_element]
-                    result
-                  else
-                    invalid_set_elements << set_element
-                    nil
-                  end
-                end
-              if set_elements.any? { |set_element| set_element.nil? }
-                raise ArgumentError, "element #{argument_value.inspect} contains invalid elements: #{invalid_set_elements.inspect}"
-              end
-              value = 0
-              set_elements.each do |set_element|
-                mask = 1 << set_element.bitfield_index
-                if mask & value == mask
-                  next
-                else
-                  value |= mask
-                end
-              end
-              value
+          value = nil
+          unless argument_value.nil?
+            value = 0
+            has_set_coerce_argument_value(enum_class, argument_value).each do |set_element|
+              value |= 1 << set_element.bitfield_index
             end
+          end
+          write_attribute set_column, value
         end
 
         define_method(set_name) do
-          value = self[set_column]
-          case
-          when value.blank?
-            ;;
-          when value.zero?
-            []
-          else
-            set_elements = enum_class.values.select do |enum_element|
-              send("#{set_name.to_s.singularize}_#{enum_element.name.underscore}?")
-            end
-            # special to_s method for element-array
-            class << set_elements
-              def to_s
-                map(&:name) * ', '
-              end
+          value = read_attribute(set_column) or return
+          set_elements = enum_class.select do |enum_element|
+            mask = 1 << enum_element.bitfield_index
+            value & mask == mask
+          end
+          # special to_s method for element-array
+          class << set_elements
+            def to_s
+              map(&:underscored_name) * ','
             end
-            set_elements
           end
+          set_elements
         end
 
-        # TODO: This should be a class method
+        class << self; self; end.instance_eval do
+          define_method("available_#{set_name}") do
+            enum_class.underscored_names.map { |name| "#{set_name_singular}_#{name}" }
+          end
+        end
         define_method("available_#{set_name}") do
-          self.methods.grep(/#{set_name.to_s.singularize}_\w+[^\?=]$/).sort.map(&:to_s)
+          enum_class.underscored_names.map { |name| "#{set_name_singular}_#{name}" }
         end
 
-        enum_class.values.each do |enum|
-          define_method("#{set_name.to_s.singularize}_#{enum.name.underscore}?") do
+        enum_class.each do |enum|
+          define_method("#{set_name_singular}_#{enum.underscored_name}?") do
             mask = 1 << enum.bitfield_index
-            self[set_column] & mask == mask
+            read_attribute(set_column) & mask == mask
           end
 
-          alias_method :"#{set_name.to_s.singularize}_#{enum.name.underscore}", :"#{set_name.to_s.singularize}_#{enum.name.underscore}?"
+          alias_method :"#{set_name_singular}_#{enum.underscored_name}", :"#{set_name_singular}_#{enum.underscored_name}?"
 
-          define_method("#{set_name.to_s.singularize}_#{enum.name.underscore}=") do |true_or_false|
+          define_method("#{set_name_singular}_#{enum.underscored_name}=") do |true_or_false|
             mask = 1 << enum.bitfield_index
-            current_value = mask & self[set_column] == mask
+            total_value = read_attribute(set_column) 
+            current_value = mask & total_value == mask
             true_or_false = true  if true_or_false.to_s == "true" || true_or_false.respond_to?(:to_i) && true_or_false.to_i == 1
             true_or_false = false if true_or_false.to_s == "false" || true_or_false.respond_to?(:to_i) && true_or_false.to_i == 0
-
             if current_value != true_or_false
-              true_or_false ? self[set_column] |= mask : self[set_column] &= ~mask
+              write_attribute set_column, true_or_false ? total_value | mask : total_value & ~mask
             end
           end
         end
       end
     end
 
-    def self.included(modul)
-      modul.extend(ClassMethods)
+    module InstanceMethods
+      def has_set_coerce_argument_value(enum_class, argument_value)
+        invalid_set_elements = []
+        set_elements =
+          if String === argument_value
+            argument_value.split(',').map(&:strip)
+          else
+            Array(argument_value)
+          end.map do |set_element|
+            if result = enum_class[set_element]
+              result
+            else
+              invalid_set_elements << set_element
+              nil
+            end
+          end
+        invalid_set_elements.empty? or
+          raise ArgumentError, "element #{argument_value.inspect} contains invalid elements: #{invalid_set_elements.inspect}"
+        set_elements
+      end
     end
   end
 end

data/lib/degu/renum/enumerated_value.rb

@@ -25,6 +25,18 @@ module Degu
 
         alias all values
 
+        def names
+          all.map(&:name)
+        end
+
+        def underscored_names
+          all.map(&:underscored_name)
+        end
+
+        def field_names
+          all.map(&:field_name)
+        end
+
         # This class encapsulates an enum field (аctually a method with arity == 0).
         class Field < Struct.new('Field', :name, :options, :block)
           # Returns true if the :default option was given.
@@ -145,6 +157,14 @@ module Degu
 
       alias_method :id, :index
 
+      def underscored_name
+        name.underscore
+      end
+
+      def field_name
+        "#{self.class.name.underscore.singularize}_#{underscored_name}"
+      end
+
       # Creates an enumerated value named +name+ with a unique autoincrementing
       # index number.
       def initialize name

data/lib/degu/version.rb

@@ -1,6 +1,6 @@
 module Degu
   # Degu version
-  VERSION         = '0.0.5'
+  VERSION         = '0.1.0'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/test/has_set_test.rb

@@ -95,10 +95,10 @@ class HasSetTest < Test::Unit::TestCase
 
   def test_should_have_to_s_method
     party = Party.new(:location => "Beach House", :drinks => [Drinks::Beer, Drinks::CubaLibre])
-    assert_equal "Beer, CubaLibre", party.drinks.to_s
+    assert_equal "beer,cuba_libre", party.drinks.to_s
   end
 
-  def test_should_provide_the_name_of_the_enum_class
+  def test_should_accept_enum_class
     Party.has_set :music, :enum_class => MusicStyles
 
     party = Party.new(:location => "Penthouse", :music => [MusicStyles::Rock])
@@ -107,6 +107,15 @@ class HasSetTest < Test::Unit::TestCase
     assert party.music_rock?, "Party should have Rock music."
   end
 
+  def test_should_accept_class_name
+    Party.has_set :music, :class_name => MusicStyles
+
+    party = Party.new(:location => "Penthouse", :music => [MusicStyles::Rock])
+    assert party.save, "Party should save!"
+    party.reload
+    assert party.music_rock?, "Party should have Rock music."
+  end
+
   def test_should_allow_unset_bitset
     itunes = Itunes.new
     assert_nil itunes.music, itunes.inspect
@@ -143,7 +152,8 @@ class HasSetTest < Test::Unit::TestCase
   end
 
   def test_should_list_all_available_enum_elements
-    assert_equal ["drink_beer", "drink_cuba_libre", "drink_wine"], Party.new.available_drinks
+    assert_equal ["drink_beer", "drink_wine", "drink_cuba_libre"], Party.new.available_drinks
+    assert_equal ["drink_beer", "drink_wine", "drink_cuba_libre"], Party.available_drinks
   end
 
   def test_should_extend_enum_with_fieldname_method

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: degu
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2011-12-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gem_hadar
@@ -90,9 +90,23 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rcov
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -103,7 +117,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: Library that includes enums, and rails support for enums and bitfield sets.
 email: dev@pkw.de
 executables: []