enum_attr 0.0.7 → 1.0.0

data/.gitignore

@@ -1,2 +1,3 @@
 .svn
 pkg/*
+spec/enum_attr_test.sqlite3

data/Gemfile

@@ -1 +1,8 @@
-source "http://rubygems.org"
+source "http://rubygems.org"  
+
+gem "activerecord", :require => "active_record"
+                                       
+group :test do
+  gem "rspec", "> 2.0"    
+  gem "sqlite3"
+end

data/Rakefile

@@ -1,5 +1,6 @@
 require "rubygems"
-require 'rake'
+require 'rake'  
+require 'rspec/core/rake_task'
 
 begin
   require 'jeweler'
@@ -15,4 +16,11 @@ begin
 
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
+end 
+
+task :default => :spec
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = '--format progress -c'
 end

data/VERSION

@@ -1 +1 @@
-0.0.7
+1.0.0

data/enum_attr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{enum_attr}
-  s.version = "0.0.7"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["qichunren"]
-  s.date = %q{2011-04-22}
+  s.date = %q{2012-09-05}
   s.description = %q{A Rails plugin which brings easy-to-use enum-like functionality to ActiveRecord models (now compatible with rails 3, ruby 1.9 and jruby). .}
   s.email = %q{whyruby@gmail.com}
   s.extra_rdoc_files = [
@@ -23,13 +23,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "enum_attr.gemspec",
-     "enum_attr_test.sqlite3",
      "init.rb",
      "lib/enum_attr.rb",
-     "rails/init.rb",
-     "spec/database.yml",
-     "spec/enum_spec.rb",
-     "spec/spec_helper.rb"
+     "rails/init.rb"
   ]
   s.homepage = %q{https://github.com/qichunren/enum_attr}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/enum_attr.rb

@@ -1,71 +1,2 @@
-# encoding: utf-8
-module EnumAttr
-  module Mixin
-    # for model Contract:
-    # enum_attr :status, [['新建', 0, "origin"], ['整理中', 1, "collecting"], ["已上传", 2, "uploaded"]]
-    # It generates these code for you:
-    # # status const 状态常量                                    
-    # STATUS_ORIGIN = 0; STATUS_COLLECTING = 2; STATUS_UPLOADED = 3       
-    #
-    # # scopes for column status
-    # scope :status_origin, where("status=0")
-    # scope :status_collection, where("status=1")
-    # scope :status_uploaded, where("status=2")    
-    #
-    # # for view select
-    # ENUMS_STATUS = [["新建", 0], ["整理中", 1], ["已上传", 2]]                    
-    
-    # # validates 包含验证
-    # validates_inclusion_of "status", :in => [1, 2, 3], :allow_nil => true
-    #   
-    # # column_name instant method
-    # def status_origin
-    #   # return status name by it's status value
-    # end
-    #
-    def enum_attr(attr, enums)
-      raise "The secone param must be a array!" unless enums.is_a? Array
-      
-      attr = attr.to_s
-      
-      enums.each do |enum|
-        const_set("#{attr.upcase}_#{enum[2].upcase}", enum[1] )
-        
-        # TODO: how to judge if there is active_record 3 gem here?
-        scope "#{attr}_#{enum[2]}".to_sym, where("#{attr}=#{enum[1]}") 
-        
-        # # TODO define_method such as "stauts_origin?"
-        # why does this get error result?
-        # define_method "#{attr}_#{enum[2]}?" do
-        #   attr == enum[1] 
-        # end             
-        class_eval(%Q{
-          def #{attr}_#{enum[2]}?
-            #{attr} == #{enum[1]}
-          end
-        })  
-        
-      end # end: enums.each
-      
-      self.class_eval(%Q{
-
-ENUMS_#{attr.upcase} = enums.collect{|item| [item[0], item[1]]}
-
-validates_inclusion_of attr, :in => enums.map{|e| e[1].to_i}, :allow_nil => true
-
-def self.#{attr}_name_by(arg)
-  ENUMS_#{attr.upcase}.find{|option| option[1] == arg }[0] rescue ""
-end
-
-def #{attr}_name
-  ENUMS_#{attr.upcase}.find{|option| option[1] == #{attr}}[0] unless #{attr}.nil?
-end
-
-})
-    end
-    
-    
-  end
-end
-
-Object.send :include, EnumAttr::Mixin
+require "enum_attr_base"
+require "enum_attr_for_active_record"

data/spec/enum_spec.rb

@@ -1,34 +1,66 @@
-# encoding: utf-8  
-require File.dirname(__FILE__) + "/spec_helper"    
+# encoding: utf-8
+require File.dirname(__FILE__) + "/spec_helper"
+require "active_record"
+
+
+dbconfig = YAML::load(File.open(File.dirname(__FILE__) + "/database.yml"))
+ActiveRecord::Base.establish_connection(dbconfig)
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+#migrations
+class CreateAllTables < ActiveRecord::Migration
+  def self.up
+    create_table(:contracts) do |t|
+      t.string :name
+      t.integer :status
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before :all do
+    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'contracts'
+  end
+end
 
 
 class Contract < ActiveRecord::Base
   enum_attr :status, [['新建', 0, "origin"], ['整理中', 1, "collecting"], ["已上传", 2, "uploaded"]]
 end
 
-describe "EnumAttr" do   
+describe "EnumAttr" do
   after(:each) do
     Contract.delete_all
   end
-  
+
+  it "should get superclass" do
+    Contract.superclass.should == ActiveRecord::Base
+  end
+
   it "should get const" do
     Contract::STATUS_ORIGIN.should == 0
     Contract::STATUS_COLLECTING.should == 1
     Contract::STATUS_UPLOADED.should == 2
   end
-  
-  it "should get scope" do                              
+
+  it "should get scope" do
     Contract.should respond_to(:status_origin)
     Contract.should respond_to(:status_collecting)
     Contract.should respond_to(:status_uploaded)
-    Contract.create(:name => "contract 1", :status => 0)
-    Contract.create(:name => "contract 2", :status => 1)
-    Contract.create(:name => "contract 3", :status => 2)
-    Contract.create(:name => "contract 4", :status => 1)
+    Contract.create!(:name => "contract 1", :status => 0)
+    Contract.create!(:name => "contract 2", :status => 1)
+    Contract.create!(:name => "contract 3", :status => 2)
+    Contract.create!(:name => "contract 4", :status => 1)
     Contract.status_origin.first.name.should == "contract 1"
-    Contract.status_collecting.count.should == 2    
+    Contract.status_collecting.count.should == 2
+  end
+
+  it "should return origanl value if not matched" do
+        contract_with_error_status = Contract.new(:name => "contract with no correct status value", :status => 100000)
+        contract_with_error_status.save(:validate => false)
+        Contract.first.status_name.should == ""
   end
-  
+
   it "should get status_#name#?" do
     contract = Contract.create(:name => "测试合同", :status => 0)
     contract.should respond_to(:status_origin?)
@@ -37,21 +69,21 @@ describe "EnumAttr" do
     contract.status_origin?.should == true
     contract.status_uploaded?.should == false
   end
-  
+
   it "should get const array" do
     Contract::ENUMS_STATUS.should == [['新建', 0], ['整理中', 1], ["已上传", 2]]
   end
-  
+
   it "should get status_name" do
     contract = Contract.create(:name => "测试合同", :status => 0)
     contract.status_name.should == "新建"
   end
-  
-  it "should get status_name_by" do           
+
+  it "should get status_name_by" do
     Contract.status_name_by(0).should == "新建"
     Contract.status_name_by(1).should == "整理中"
     Contract.status_name_by(2).should == "已上传"
-    Contract.status_name_by(3).should == "" 
+    Contract.status_name_by(3).should == ""
   end
 
 end

data/spec/spec_helper.rb

@@ -1,27 +1,6 @@
 # encoding: utf-8
-require 'rubygems'    
-require 'active_record'  
-require 'yaml'           
-require File.expand_path("../../lib/enum_attr", __FILE__)
+require 'yaml'
+require 'rspec'
+require 'logger'
 
-dbconfig = YAML::load(File.open(File.dirname(__FILE__) + "/database.yml"))    
-ActiveRecord::Base.establish_connection(dbconfig)
-
-#migrations
-class CreateAllTables < ActiveRecord::Migration
-  def self.up
-    create_table(:contracts) do |t|
-      t.string :name
-      t.integer :status
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.before :all do
-    # ActiveRecord::Base.connection.execute 
-    # 'CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255))' 
-    # unless ActiveRecord::Base.connection.table_exists? 'users'
-    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'contracts'
-  end
-end
+require File.expand_path("../../lib/enum_attr", __FILE__)

metadata

@@ -1,32 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: enum_attr
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - qichunren
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-22 00:00:00 +08:00
-default_executable: 
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies: []
-
-description: A Rails plugin which brings easy-to-use enum-like functionality to ActiveRecord models (now compatible with rails 3, ruby 1.9 and jruby). .
+description: A Rails plugin which brings easy-to-use enum-like functionality to ActiveRecord
+  models (now compatible with rails 3, ruby 1.9 and jruby). .
 email: whyruby@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -34,45 +26,37 @@ files:
 - Rakefile
 - VERSION
 - enum_attr.gemspec
-- enum_attr_test.sqlite3
 - init.rb
 - lib/enum_attr.rb
 - rails/init.rb
-- spec/database.yml
 - spec/enum_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/qichunren/enum_attr
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-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 
-      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 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: enum_attr is a Ruby gem to manage enum column for active_record.
-test_files: 
+test_files:
 - spec/enum_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/database.yml

@@ -1,4 +0,0 @@
-adapter: sqlite3
-database: enum_attr_test.sqlite3
-pool: 5
-timeout: 5000