degu 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d19e9c2f8ad9ea3ccf2b81563146a0e5b3101d3
-  data.tar.gz: ad152874af07e021afb937f992b2214d64ab17ee
+  metadata.gz: 85096c24629c9f6d96e11998cfa30bc6da436f18
+  data.tar.gz: 31a96a5d457a1c0f2ce9b1f797e8fa0d4c317097
 SHA512:
-  metadata.gz: 1d3ba38a2bae5876cca07457b102a77ea338f3cc5cb8ff77062119184c6dac21e0c06ee2c571512239a3633b8bd08d1c9e73e3f1376ac4170918a9057aa365e7
-  data.tar.gz: e49a3fa11d225029707053525cddbf19f4ec9f65faa18b8bab49e4bd0dce680344f09ba29bfca7ec2ef3886ca77ea22eb332ccdab28c5b48d0148d12060d0cea
+  metadata.gz: 7bbdbd90d9bf88a7c3e0b9dd34b155752777f3bb911c9ed547e5da3ccf60a2730e59d1741fbc809f410fd70b1a4347b3ce3d0ec67ffc06901843579dd29c09aa
+  data.tar.gz: 07558b62edcfa2795ce0c51ad32e3058210707573274ce9f3d5845a5a6d9ee047eb450d4555f1f1afe78657133d727d13bd53d6050bd1d89f2dda83ee0c81b1f

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/degu.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: degu 0.8.1 ruby lib
+# stub: degu 0.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "degu"
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2016-02-24"
+  s.date = "2016-06-23"
   s.description = "Library that includes enums, and rails support for enums and bitfield sets."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/degu.rb", "lib/degu/has_enum.rb", "lib/degu/has_set.rb", "lib/degu/init_active_record_plugins.rb", "lib/degu/polite.rb", "lib/degu/railtie.rb", "lib/degu/renum.rb", "lib/degu/renum/enumerated_value.rb", "lib/degu/renum/enumerated_value_type_factory.rb", "lib/degu/rude.rb", "lib/degu/version.rb"]
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.3.1"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, ["< 5.1", ">= 3.0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.3.1"])
+      s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
       s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, ["< 5.1", ">= 3.0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.3.1"])
+    s.add_dependency(%q<gem_hadar>, ["~> 1.7.1"])
     s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/lib/degu/has_enum.rb

@@ -15,20 +15,22 @@ module Degu
        #   end
       def has_enum(enum_name, options={})
 
-        enum_column = options.has_key?(:column_name) ? options[:column_name].to_s : "#{enum_name}_type"
+        enum_column = options.key?(:column_name) ? options[:column_name].to_s : "#{enum_name}_type"
 
         self.send("validate", "#{enum_column}_check_for_valid_type_of_enum".to_sym)
 
         # throws a NameError if Enum Class doesn't exists
-        enum_class = options.has_key?(:class_name) ? options[:class_name].to_s.constantize : enum_name.to_s.camelize.constantize
+        enum_class = options.key?(:class_name) ? options[:class_name].to_s.constantize : enum_name.to_s.camelize.constantize
 
         # Enum must be a Renum::EnumeratedValue Enum
         raise ArgumentError, "expected Renum::EnumeratedValue" unless enum_class.superclass == Renum::EnumeratedValue
 
-        define_method("reset_enum_changed") do
-          @enum_changed = false
+        if respond_to?(:after_save)
+          define_method("reset_enum_changed") do
+            @enum_changed = false
+          end
+          after_save :reset_enum_changed
         end
-        after_save :reset_enum_changed
 
         define_method("#{enum_name}") do
           begin
@@ -51,13 +53,19 @@ module Degu
           if enum_to_set.to_s.strip.empty?
             self[enum_column] = nil
           elsif enum_resolved
-            column_type = ((column_definition = self.class.columns_hash[enum_column]) and column_definition.type)
-            self[enum_column] = case column_type
-            when :integer
-              enum_resolved.index
-            else
-              enum_resolved.name
-            end
+            column_type =
+              if self.class.respond_to?(:columns_hash) and
+                column_definition = self.class.columns_hash[enum_column]
+              then
+                column_definition.type
+              end
+            self[enum_column] =
+              case column_type
+              when :integer
+                enum_resolved.index
+              else
+                enum_resolved.name
+              end
           else
             raise ArgumentError, "could not resolve #{enum_to_set.inspect}"
           end

data/lib/degu/version.rb

@@ -1,6 +1,6 @@
 module Degu
   # Degu version
-  VERSION         = '0.8.1'
+  VERSION         = '0.9.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/test/has_enum_test.rb

@@ -208,4 +208,15 @@ class HasEnumTest < Test::Unit::TestCase
     assert_equal false, with_integer.valid?
   end
 
+  def test_should_allow_for_nondb_models
+    without_db = ClassWithoutDb.new
+    without_db.product = Product::Titanium
+    assert_equal 'Titanium', without_db[:product_type]
+
+    without_db[:product_type] = 0
+    assert_equal Product::Silver, without_db.product
+
+    without_db[:product_type] = :gold
+    assert_equal Product::Gold, without_db.product
+  end
 end

data/test/test_helper.rb

@@ -164,6 +164,23 @@ class ClassWithIntergerColumn < ActiveRecord::Base
   has_enum :product
 end
 
+class ClassWithoutDb
+  include ActiveModel::Model
+  include Degu::HasEnum
+
+  def [](name)
+    instance_variable_get "@#{name}"
+  end
+
+  def []=(name, value)
+    instance_variable_set "@#{name}", value
+  end
+
+  attr_accessor :product_type
+
+  has_enum :product
+end
+
 class ClassWithLargeDataset < ActiveRecord::Base
   has_set :dataset
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: degu
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement