haz_enum 0.5.3 → 0.5.5

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+.rake_tasks

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "1.9.3"
+

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: .
+  specs:
+    haz_enum (0.5.4)
+      activerecord (>= 2.3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    multi_json (1.3.6)
+    rake (10.0.3)
+    renum (1.3.1)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.34)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haz_enum!
+  rake (~> 10.0.3)
+  renum (~> 1.3.1)
+  rspec (~> 2.12.0)
+  sqlite3 (~> 1.3)

data/Rakefile

@@ -1,47 +1,9 @@
 require 'rubygems'
+require "bundler"
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "haz_enum"
-    gem.summary = %Q{has_set and has_enum for ActiveRecord}
-    gem.description = %Q{use has_set and has_enum in your ActiveRecord models if you want to have one (has_enum) value from a defined enumeration or more (has_set))}
-    gem.email = "andi@galaxycats.com"
-    gem.homepage = "http://github.com/galaxycats/haz_enum"
-    gem.authors = ["thyphoon"]
-    gem.add_dependency "activerecord", ">= 2.3.0"
-    gem.add_development_dependency "rspec", "~> 1.3.0"
-    gem.add_development_dependency "renum", "~> 1.3.1"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+require 'rspec/core/rake_task'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "haz_enum #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/haz_enum.gemspec

@@ -1,12 +1,11 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.join(File.dirname(__FILE__), *%w[lib version])
 
 Gem::Specification.new do |s|
   s.name = %q{haz_enum}
-  s.version = "0.5.3"
-
+  s.version = HazEnum::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.rubyforge_project = "haz_enum"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["thyphoon"]
   s.date = %q{2011-05-25}
@@ -16,48 +15,18 @@ Gem::Specification.new do |s|
     "LICENSE",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "CHANGESET",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "haz_enum.gemspec",
-    "lib/haz_enum.rb",
-    "lib/haz_enum/enum.rb",
-    "lib/haz_enum/set.rb",
-    "spec/enum_spec.rb",
-    "spec/set_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
+  s.files = `git ls-files`.split("\n")
+
   s.homepage = %q{http://github.com/galaxycats/haz_enum}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.0}
   s.summary = %q{has_set and has_enum for ActiveRecord}
-  s.test_files = [
-    "spec/enum_spec.rb",
-    "spec/set_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.test_files = `git ls-files -- spec/*`.split("\n")
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<renum>, ["~> 1.3.1"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.3.0"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<renum>, ["~> 1.3.1"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.3.0"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<renum>, ["~> 1.3.1"])
-  end
+  s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
+  s.add_development_dependency(%q<renum>, ["~> 1.3.1"])
+  s.add_development_dependency(%q<rake>, ["~> 10.0.3"])
+  s.add_development_dependency(%q<sqlite3>, ["~> 1.3"])
 end
 

data/lib/haz_enum/enum.rb

@@ -3,11 +3,17 @@ module HazEnum
     def has_enum(enum_name, options={})
       enum_name = enum_name.to_s
       enum_column = options.has_key?(:column_name) ? options[:column_name].to_s : enum_name
-      enum_class = options.has_key?(:class_name) ? options[:class_name].constantize : enum_name.pluralize.camelize.constantize
-      
+      enum_class = if options.has_key?(:class_name)
+        options[:class_name].constantize
+      elsif options[:enum]
+        options[:enum]
+      else
+        enum_name.pluralize.camelize.constantize
+      end
+
       self.attr_protected("#{enum_column}") if enum_name != enum_column
       self.validate "#{enum_column}_check_for_valid_enum_value"
-      
+
       define_method "#{enum_name}" do
         begin
           return enum_class.const_get(self["#{enum_column}"]) if self["#{enum_column}"]
@@ -16,7 +22,7 @@ module HazEnum
           return nil
         end
       end
-      
+
       define_method "#{enum_name}=" do |enum_to_set|
         if enum_to_set.blank?
           self["#{enum_column}"] = nil
@@ -26,28 +32,28 @@ module HazEnum
           self["#{enum_column}"] = enum_class.const_get(enum_to_set).name
         end
       end
-      
+
       define_method "has_#{enum_name}?" do |enum|
         send(enum_name) == enum
       end
-      
+
       define_method "#{enum_name}_changed?" do
         send("#{enum_column}_changed?")
       end if enum_name != enum_column
-      
+
       define_method "#{enum_column}_check_for_valid_enum_value" do
         return true if self["#{enum_column}"].nil?
         begin
           enum_class.const_get(self["#{enum_column}"])
         rescue NameError => e
-          
+
           message = I18n.translate("activerecord.errors.models.#{self.class.name.underscore}.attributes.#{enum_name}.enum_value_invalid", :value => self["#{enum_column}"], :name => enum_name) ||
                     I18n.translate("activerecord.errors.models.#{self.class.name.underscore}.enum_value_invalid", :value => self["#{enum_column}"], :name => enum_name) ||
                     I18n.translate(:'activerecord.errors.messages.enum_value_invalid', :value => self["#{enum_column}"], :name => enum_name)
-          
+
           self.errors.add(enum_name.to_sym, message)
         end
       end
     end
   end
-end
+end

data/lib/version.rb

@@ -0,0 +1,3 @@
+module HazEnum
+  VERSION = "0.5.5"
+end

data/spec/enum_spec.rb

@@ -1,45 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "HazEnum" do
-  
+
   describe "Enum" do
-    
+
     before(:all) do
       setup_db
     end
-    
+
     it "should have class method has_enum" do
       ClassWithEnum.should respond_to(:has_enum)
     end
-    
+
     it "should be able to set enum-attribute via hash in initializer" do
       ClassWithEnum.new(:product => Products::Silver).product.should be(Products::Silver)
       ClassWithCustomNameEnum.new(:product => Products::Silver).product.should be(Products::Silver)
     end
-    
+
     it "should be able to set enum-value as string in initializer" do
       ClassWithEnum.new(:product => "Silver").product.should be(Products::Silver)
     end
-    
+
     it "should have has_<association>? method" do
       class_with_enum = ClassWithEnum.new(:product => "Silver")
       class_with_enum.has_product?(Products::Silver).should == true
       class_with_enum.has_product?(Products::Gold).should == false
     end
-    
+
     it "should not be able to set enum-attribute by colum-name via hash in initializer" do
       ClassWithCustomNameEnum.new(:custom_name => Products::Silver).product.should_not be(Products::Silver)
       ClassWithCustomNameEnum.new(:custom_name => Products::Silver.name).product.should_not be(Products::Silver)
     end
-    
+
     it "should have a enum_value attribute" do
       ClassWithCustomNameEnum.new(:product => Products::Gold).custom_name.should be(Products::Gold.name)
     end
-    
+
     it "colum_name should be configurable" do
       ClassWithCustomNameEnum.new(:product => Products::Gold).product.should be(Products::Gold)
     end
-    
+
     it "should know if enum-attribute has changed" do
       product_enum = ClassWithEnum.new(:product => Products::Silver)
       product_enum.product_changed?.should be(true)
@@ -48,14 +48,14 @@ describe "HazEnum" do
       product_enum.product = Products::Gold
       product_enum.product_changed?.should be(true)
     end
-    
+
     it "should know if enum-attribute has not really changed" do
       product_enum = ClassWithEnum.new(:product => Products::Silver)
       product_enum.save
       product_enum.product = Products::Silver
       product_enum.product_changed?.should be(false)
     end
-    
+
     it "should validate enum-value" do
       enum_mixin = ClassWithEnum.new
       platin = "Platin"
@@ -64,20 +64,34 @@ describe "HazEnum" do
       enum_mixin.valid?.should_not be(true)
       enum_mixin.errors[:product].size.should > 0
     end
-    
+
     it "should work without renum (just ruby module with classes)" do
       role_enum = ClassWithEnum.new(:module_role => ModuleRoles::Admin)
       role_enum.has_module_role?(ModuleRoles::Admin).should == true
     end
-    
+
     it "should handle blank parameter of setter" do
       ClassWithEnum.new(:product => nil).product.should be_nil
       ClassWithEnum.new(:product => "").product.should be_nil
     end
-    
+
+    it "should be able to set the class_name manually" do
+      main_product_enum = ClassWithCustomNameField.new(:main_product => Products::Silver)
+      main_product_enum.main_product.should == Products::Silver
+      main_product_enum.save
+      ClassWithCustomNameField.find(main_product_enum.id).main_product.should == Products::Silver
+    end
+
+    it "should be able to set the enum class manually" do
+      sub_product_enum = ClassWithCustomNameField.new(:sub_product => Products::Gold)
+      sub_product_enum.sub_product.should == Products::Gold
+      sub_product_enum.save
+      ClassWithCustomNameField.find(sub_product_enum.id).sub_product.should == Products::Gold
+    end
+
     after(:all) do
       teardown_db
     end
-    
+
   end
-end
+end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ require "rubygems"
 require "active_record"
 require 'renum'
 require 'haz_enum'
-require 'spec'
-require 'spec/autorun'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Migration.verbose = false
@@ -16,6 +14,7 @@ def setup_db
       create_table :class_with_enums do |t|
         t.column :title, :string
         t.column :product, :string
+        t.column :module_role, :string
         t.column :created_at, :datetime
         t.column :updated_at, :datetime
       end
@@ -27,10 +26,21 @@ def setup_db
         t.column :updated_at, :datetime
       end
 
+      create_table :class_with_custom_name_fields do |t|
+        t.column :title, :string
+        t.column :main_product, :string
+        t.column :sub_product, :string
+        t.column :created_at, :datetime
+        t.column :updated_at, :datetime
+      end
+
       create_table :class_with_sets do |t|
         t.column :title, :string
         t.column :roles_bitfield, :integer
         t.column :roles_yml, :text
+        t.column :module_roles_yml, :text
+        t.column :extended_roles_yml, :text
+        t.column :module_bitfield_roles_bitfield, :integer
         t.column :created_at, :datetime
         t.column :updated_at, :datetime
       end
@@ -90,6 +100,11 @@ class ClassWithCustomNameEnum < ActiveRecord::Base
   has_enum :product, :column_name => :custom_name
 end
 
+class ClassWithCustomNameField < ActiveRecord::Base
+  has_enum :main_product, :class_name => "Products"
+  has_enum :sub_product, :enum => Products
+end
+
 class ClassWithSet < ActiveRecord::Base
   has_set :roles
   has_set :extended_roles, :class_name => :roles do
@@ -102,7 +117,7 @@ class ClassWithSet < ActiveRecord::Base
 end
 
 class YmlSet < ActiveRecord::Base
-  set_table_name "class_with_sets"
+  self.table_name = "class_with_sets"
   has_set :roles, :field_type => :yml
 end
 
@@ -111,7 +126,3 @@ class ClassWithCustomNameSet < ActiveRecord::Base
 end
 
 teardown_db # And drop them right afterwards
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,130 +1,149 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haz_enum
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.5.5
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
 platform: ruby
-authors: 
+authors:
 - thyphoon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
   name: renum
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
-description: use has_set and has_enum in your ActiveRecord models if you want to have one (has_enum) value from a defined enumeration or more (has_set))
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+description: use has_set and has_enum in your ActiveRecord models if you want to have
+  one (has_enum) value from a defined enumeration or more (has_set))
 email: andi@galaxycats.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
+- .gitignore
+- .travis.yml
 - CHANGESET
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - haz_enum.gemspec
 - lib/haz_enum.rb
 - lib/haz_enum/enum.rb
 - lib/haz_enum/set.rb
+- lib/version.rb
 - spec/enum_spec.rb
 - spec/set_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/galaxycats/haz_enum
 licenses: []
-
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.5.0
+rubyforge_project: haz_enum
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: has_set and has_enum for ActiveRecord
-test_files: 
+test_files:
 - spec/enum_spec.rb
 - spec/set_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.5.3