coded_options 0.2.7 → 1.0.0

data/.gitignore

@@ -0,0 +1,5 @@
+Gemfile.lock
+.bundle
+.DS_Store
+*.swp
+*.gem

data/Gemfile

@@ -1,8 +1,2 @@
 source :rubygems
-
-gem "rails", "~>3.0.0"
-
-group :development do
-  gem "rspec", "~>2.0.0"
-  gem "rr"
-end
+gemspec

data/README.md

@@ -25,7 +25,7 @@ a plain Ruby object as follows:
     require "coded_options"
 
     class Foo
-      extend CodedOptions
+      include CodedOptions
       attr_accessor :state_id, :type_id
       coded_options :state => %w(active closed), :type => %w(stupid awesome)
     end
@@ -45,7 +45,7 @@ numerically by the keys of the hash.
 
 If you want to use this with MongoDB, just add
 
-    extend CodedOptions
+    include CodedOptions
 
 to your model.
 

data/Rakefile

@@ -1,18 +1,2 @@
 require "bundler"
-Bundler.setup
-
-require "rspec"
-require "rspec/core/rake_task"
-
-Rspec::Core::RakeTask.new(:spec)
-
-gemspec = eval(File.read(File.join(Dir.pwd, "coded_options.gemspec")))
-
-task :build => "#{gemspec.full_name}.gem"
-
-task :test => :spec
-
-file "#{gemspec.full_name}.gem" => gemspec.files + ["coded_options.gemspec"] do
-  system "gem build coded_options.gemspec"
-  system "gem install coded_options-#{CodedOptions::VERSION}.gem"
-end
+Bundler::GemHelper.install_tasks

data/coded_options.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path("../lib/coded_options/version", __FILE__)
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "coded_options/version"
 
 Gem::Specification.new do |s|
   s.name        = "coded_options"
@@ -10,23 +12,13 @@ Gem::Specification.new do |s|
   s.summary     = "Making options easier"
   s.description = "A gem for making fields with coded values easier"
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project = "coded_options"
 
-  # lol - required for validation
-  s.rubyforge_project         = "coded_options"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-  # If you have other dependencies, add them here
-  # s.add_dependency "another", "~> 1.2"
-
-  # If you need to check in files that aren't .rb files, add them here
-  s.files        = Dir["{lib}/**/*.rb", "spec/*.rb", "LICENSE", "*.md", "Gemfile", "Rakefile", ".gemtest", "coded_options.gemspec"]
-  s.require_path = 'lib'
-
-  # If you need an executable, add it here
-  # s.executables = ["coded_options"]
-
-  # If you have C extensions, uncomment this line
-  # s.extensions = "ext/extconf.rb"
-
-  s.add_bundler_dependencies
+  s.add_development_dependency "rspec", "~>2.0.0"
+  s.add_development_dependency "rr"
 end

data/lib/coded_options/base.rb

@@ -1,38 +1,50 @@
 module CodedOptions
 
-  def coded_options *args
-    case args.length
-      when 1 then args.first.each {|name, values| setup_coded_options name, values }
-      when 2 then setup_coded_options *args
-      else raise("Error in coded_options syntax, expecting name and values or a hash, got #{args.inspect}")
-    end
+  def self.included base
+    base.send :extend, ClassMethods
+  end
+
+  module PrivateClassMethods
+    attr_accessor :initial_value
+    @initial_value = 0
   end
+  extend PrivateClassMethods
+
+  module ClassMethods
+    def coded_options *args
+      case args.length
+        when 1 then args.first.each {|name, values| setup_coded_options name, values }
+        when 2 then setup_coded_options *args
+        else raise("Error in coded_options syntax, expecting name and values or a hash, got #{args.inspect}")
+      end
+    end
 
-  private
+    private
 
-  def setup_coded_options singular_name, values
-    plural_name = singular_name.to_s.pluralize
+    def setup_coded_options singular_name, values
+      plural_name = singular_name.to_s.pluralize
 
-    const_set plural_name.upcase, values
-    const_set "#{singular_name}_options".upcase, to_options(values)
+      const_set plural_name.upcase, values
+      const_set "#{singular_name}_options".upcase, to_options(values)
 
-    class_eval <<-EOT, __FILE__, (__LINE__+1)
-      def #{singular_name}                                                 # def state
-        return unless #{singular_name}_id                                  #   return unless state_id
-        #{plural_name.upcase}[#{singular_name}_id.to_i]                    #   STATES[state_id.to_i]
-      end                                                                  # end
+      class_eval <<-EOT, __FILE__, (__LINE__+1)
+        def #{singular_name}                                                 # def state
+          return unless #{singular_name}_id                                  #   return unless state_id
+          #{plural_name.upcase}[#{singular_name}_id.to_i]                    #   STATES[state_id.to_i]
+        end                                                                  # end
 
-      def #{singular_name}= new_value                                       # def state= new_value
-        send :#{singular_name}_id=, #{plural_name.upcase}.index(new_value)  #   send :state_id=, STATES.index(new_value)
-      end                                                                   # end
-    EOT
-  end
+        def #{singular_name}= new_value                                       # def state= new_value
+          send :#{singular_name}_id=, #{plural_name.upcase}.index(new_value)  #   send :state_id=, STATES.index(new_value)
+        end                                                                   # end
+      EOT
+    end
 
-  def to_options values
-    if values.is_a? Hash
-      values.sort{|a,b| a.first <=> b.first}.map{|a| a.reverse}
-    else
-      values.zip((0..values.length).to_a)
+    def to_options values
+      if values.is_a? Hash
+        values.sort{|a,b| a.first <=> b.first}.map{|a| a.reverse}
+      else
+        values.zip((CodedOptions.initial_value..values.length).to_a)
+      end
     end
   end
 

data/lib/coded_options/version.rb

@@ -1,3 +1,3 @@
 module CodedOptions
-  VERSION = "0.2.7"
+  VERSION = "1.0.0"
 end

data/lib/rails/coded_options.rb

@@ -1,7 +1,7 @@
 module CodedOptions
   class Railtie < Rails::Railtie
     initializer "coded_options.initialize" do |app|
-      ActiveRecord::Base.send :extend, CodedOptions if defined?(ActiveRecord)
+      ActiveRecord::Base.send :include, CodedOptions if defined?(ActiveRecord)
     end
   end
 end

data/spec/coded_options_spec.rb

@@ -3,10 +3,26 @@ require "active_support/inflector"
 
 describe CodedOptions do
 
+  describe "changing initial value" do
+    it "should use the initial value given" do
+      CodedOptions.initial_value = 1
+      CodedOptions.initial_value.should == 1
+
+      class Foo
+        include CodedOptions
+        attr_accessor :state_id
+        coded_options :state, %w(initial active closed)
+      end
+
+      Foo::STATE_OPTIONS.should == [["initial", 1], ["active", 2], ["closed", 3]]
+      CodedOptions.initial_value = 0
+    end
+  end
+
   describe "allow setting the *_id field via the value" do
     it "should perform a lookup and set the proper id" do
       class Foo
-        extend CodedOptions
+        include CodedOptions
         attr_accessor :state_id
         coded_options :state, %w(initial active closed)
       end
@@ -22,7 +38,7 @@ describe CodedOptions do
 
     before(:all) do
       class Foo
-        extend CodedOptions
+        include CodedOptions
         coded_options :state, %w(initial active closed)
       end
 
@@ -55,7 +71,7 @@ describe CodedOptions do
       class Bar
         attr_accessor :state_id, :foo_id
 
-        extend CodedOptions
+        include CodedOptions
         coded_options :state => %w(initial active closed),
                       :foo   => %w(bar quux baz)
       end
@@ -76,7 +92,7 @@ describe CodedOptions do
 
     before(:all) do
       class Foo
-        extend CodedOptions
+        include CodedOptions
         coded_options :gender, {99 => 'other', 1 => 'male', 2 => 'female'}
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coded_options
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 2
-  - 7
-  version: 0.2.7
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,30 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rr
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,7 +46,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  type: :development
+  version_requirements: *id002
 description: A gem for making fields with coded values easier
 email: 
 - jason.dew@gmail.com
@@ -74,18 +58,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gemtest
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- coded_options.gemspec
+- lib/coded_options.rb
 - lib/coded_options/base.rb
 - lib/coded_options/version.rb
-- lib/coded_options.rb
 - lib/rails/coded_options.rb
 - spec/coded_options_spec.rb
 - spec/spec_helper.rb
-- LICENSE
-- README.md
-- Gemfile
-- Rakefile
-- .gemtest
-- coded_options.gemspec
 has_rdoc: true
 homepage: http://github.com/jasondew/coded_options
 licenses: []
@@ -109,18 +94,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: coded_options
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Making options easier
-test_files: []
-
+test_files: 
+- spec/coded_options_spec.rb
+- spec/spec_helper.rb