active_finite 0.1.5 → 0.2.0

data/Gemfile

@@ -13,6 +13,7 @@ group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
+  gem "ruby-debug19", "~> 0.11.6"
 end
 
 group :test do

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/active_finite.gemspec

@@ -0,0 +1,76 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{active_finite}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["me"]
+  s.date = %q{2011-07-03}
+  s.description = %q{longer description of your gem}
+  s.email = %q{me@stuffihavemade.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "active_finite.gemspec",
+    "lib/active_finite.rb",
+    "lib/as_class_name.rb",
+    "lib/external_includes.rb",
+    "lib/get_table.rb",
+    "lib/master_table.rb",
+    "spec/active_finite_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/villans.json"
+  ]
+  s.homepage = %q{http://github.com/r4pdevteam/active_finite}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
+  s.summary = %q{one-line summary of your gem}
+  s.test_files = [
+    "spec/active_finite_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
+    else
+      s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
+      s.add_dependency(%q<json>, ["~> 1.5.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
+    s.add_dependency(%q<json>, ["~> 1.5.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
+  end
+end
+

data/lib/active_finite.rb

@@ -1,8 +1,4 @@
-require 'pathname'
-require 'find'
-require 'active_support/inflector'
-require 'active_record'
-require 'json'
+require_relative 'external_includes.rb'
 require_relative 'master_table.rb'
 require_relative 'get_table.rb'
 
@@ -65,7 +61,7 @@ def modify_finite args
   end
   file_name   = args[:from_file] 
   values      = args[:values]
-  column_name = args[:column_name] || :value
+  column_name = args[:column_name] || default_column_name(table_name)
   if values.nil? and file_name.nil?
     raise 'Either :from_file or :values must be specified.'
   end
@@ -85,10 +81,7 @@ def modify_finite args
   end
 end
 
-def default_column_name
-  :value
+def default_column_name table_name
+  table_name.to_s.singularize.to_sym
 end
 
-def as_class_name table_name
-  table_name.to_s.singularize.capitalize.to_sym
-end

data/lib/as_class_name.rb

@@ -0,0 +1,5 @@
+require_relative 'external_includes'
+
+def as_class_name table_name
+  table_name.to_s.singularize.capitalize.to_sym
+end

data/lib/external_includes.rb

@@ -0,0 +1,5 @@
+require 'pathname'
+require 'find'
+require 'active_support/inflector'
+require 'active_record'
+require 'json'

data/lib/get_table.rb

@@ -1,4 +1,5 @@
-require 'active_record'
+require 'external_includes'
+require_relative 'as_class_name.rb'
 
 def get_table sym, *args
   class_name = as_class_name sym

data/lib/master_table.rb

@@ -1,11 +1,12 @@
 require_relative 'get_table.rb'
+require_relative 'external_includes.rb'
 
 module MasterTable
   def self.table_name
     :active_finites
   end
   def self.column_name
-    :value
+    default_column_name self.table_name
   end
   def self.table
     get_table self.table_name
@@ -14,7 +15,7 @@ module MasterTable
     if self.table.table_exists?
       self.table
       .all
-      .collect {|x| x.send default_column_name.to_s}
+      .collect {|x| x.send self.column_name.to_s}
       .collect {|x| get_table x}
     else
       []

data/spec/active_finite_spec.rb

@@ -1,3 +1,4 @@
+require 'ruby-debug'
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 def reconnect
@@ -75,7 +76,7 @@ describe 'all_finite_tables' do
                    column_name: :column,
                    values: ["bye"]
 
-    all_finite_tables.should == [Thing]
+    all_finite_tables.should eql [Thing]
   end
 end
 
@@ -94,12 +95,18 @@ describe 'add_finites' do
   before :each do
     reconnect
   end
+  it 'by default, creates a column with the same name as the table' do
+    finites = ['red']
+    add_finites in_table: :colors, values: finites
+    Color.where(:color => :red).limit(1).first.color.should eql "red"
+  end
+
   it 'adds finites as rows to the database' do
     finites = ['red', 'blue', 'green']
     add_finites in_table: :colors, values: finites
 
     finites.each do |f|
-      Color.where(default_column_name => f).should_not nil
+      Color.where(:color => f).limit(1).first.color.should eql f.to_s
     end
   end
 
@@ -115,7 +122,7 @@ describe 'add_finites' do
       column_name: :column_name
 
     finites.each do |f|
-      Color.where(:column_name => f).should_not nil
+      Character.where(:column_name => f).limit(1).first.column_name.should eql f.to_s
     end
   end
 
@@ -125,16 +132,17 @@ describe 'add_finites' do
       from_file: file_path
 
     ['scaramanga', 'no', 'janus'].each do |v|
-      Villan.where(default_column_name => v).should_not nil
+      Villan.where(:villan => v).limit(1).first.villan.should eql v
     end
   end
 
   it 'will fail atomically' do
     begin
-      add_finites in_table: :wu_members, values: ['rza', 'gza', nil]
+      add_finites in_table: :wu_members, values: ['rza']
+      add_finites in_table: :wu_members, values: ['gza', nil]
     rescue
-      ['rza', 'gza'].each do |w|
-        get_table(:wu_members).where(default_column_name => w).should nil
+      ['gza'].each do |w|
+        get_table(:wu_members).where(:wu_member => w).limit(1).first.should nil
       end
     end
   end
@@ -151,15 +159,28 @@ describe 'delete_finites' do
   end
 
   it 'can delete previously added finites' do
-    add_finites in_table: :adjs, values: ['delete', 'drop']
-    delete_finites in_table: :adjs, values: ['delete']
-    Adj.where(default_column_name => 'delete').should nil
-    Adj.where(default_column_name => 'drop').should_not nil
+    add_finites in_table: :adjs, values: ['drop', 'delete']
+    Adj.where(:adj => 'drop').limit(1).first.adj.should eql 'drop'
+    delete_finites in_table: :adjs, values: ['drop']
+    Adj.where(:adj => 'drop').limit(1).size.should eql 0
+  end
+
+  it 'can use a different column name' do
+    finites = ['mickey', 'donald', 'scrooge']
+    add_finites in_table: :characters, 
+      values: finites, 
+      column_name: :column_name
+
+    delete_finites in_table: :characters, 
+      values: ['mickey'], 
+      column_name: :column_name
+
+    Character.where(:column_name => 'mickey').limit(1).size.should eql 0
   end
 
   it 'will remove the table if there are no finites left' do
-    add_finites in_table: :deletes, values: ['delete']
-    delete_finites in_table: :deletes, values: ['delete']
+    add_finites in_table: :deletes, column_name: :value, values: ['delete']
+    delete_finites in_table: :deletes, column_name: :value, values: ['delete']
     Object.const_defined?(:Delete).should_not be true
   end
 

metadata

@@ -2,7 +2,7 @@
 name: active_finite
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - me
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 -04:00
+date: 2011-07-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.6
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: longer description of your gem
 email: me@stuffihavemade.com
 executables: []
@@ -95,7 +106,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- active_finite.gemspec
 - lib/active_finite.rb
+- lib/as_class_name.rb
+- lib/external_includes.rb
 - lib/get_table.rb
 - lib/master_table.rb
 - spec/active_finite_spec.rb
@@ -115,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 611629043
+      hash: -272148465
       segments: 
       - 0
       version: "0"