active_finite 0.1.4 → 0.1.5

data/README.rdoc

@@ -24,7 +24,7 @@ Let's start by defining a simple migration:
   end
 
 Now that we some hellos in our Hello model, we can access them using:
-  hellos = get_finite_table :hellos
+  hellos = get_table :hellos
 
 The variable hellos now holds a class derived from ActiveRecord named 
 Hello, so all of the normal ActiveRecord methods can be used.
@@ -33,7 +33,7 @@ We can also a collection of all of the active record classes defined by
 active_finite by using:
   all_finite_tables
 
-Using get_finite_table and all_finite_tables implicitly bring the associated
+Using get_table and all_finite_tables implicitly bring the associated
 classes into scope, so a single call to all_finite_tables is sufficent to 
 define all of the models.
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/active_finite.rb

@@ -3,59 +3,13 @@ require 'find'
 require 'active_support/inflector'
 require 'active_record'
 require 'json'
-
-def get_finite_table sym, *args
-  class_name = as_class_name sym
-  class_not_defined = not(Object.const_defined? class_name)
-  should_force = args.any? {|x| x == :force}
-  if class_not_defined or should_force
-    anon = Class.new ActiveRecord::Base
-    Object.const_set class_name, anon
-  else
-    Object.const_get class_name
-  end
-end
-
-def as_class_name table_name
-  table_name.to_s.singularize.capitalize.to_sym
-end
+require_relative 'master_table.rb'
+require_relative 'get_table.rb'
 
 def all_finite_tables
-  master = get_finite_table(master_table_name)
-  if master.table_exists?
-    master
-    .where("#{default_column_name} != ?", master_table_name)
-    .collect {|x| x.send default_column_name.to_s}
-    .collect {|x| get_finite_table x}
-  else
-    []
-  end
-end
-
-def master_table_name
-  :active_finites
-end
-
-def add_to_master table_name
-  add_finites in_table: master_table_name, values: [table_name]
-end
-
-def delete_from_master table_name
-  delete_finites in_table: master_table_name, values: [table_name]
-end
-
-def is_in_master_table? table_name
-  if table_name.eql? master_table_name
-    true
-  else
-    get_finite_table(master_table_name)
-    .where("#{default_column_name} != ?", master_table_name)
-    .where("#{default_column_name} == ?", table_name)
-    .any?
-  end
+  MasterTable.all
 end
 
-
 def add_finites args
   modify_finite args do |vs, klass, column_name|
     if not klass.table_exists?
@@ -63,9 +17,10 @@ def add_finites args
         create_table klass.table_name do |t|
           t.string column_name, :null => false
         end
+        add_index klass.table_name, column_name, :unique => true
       end
-      add_to_master klass.table_name
     end
+    MasterTable.add klass.table_name
     vs.each do |v|
       obj = klass.new
       obj.send column_name.to_s + '=', v
@@ -74,12 +29,13 @@ def add_finites args
   end
 end
 
-def delete_finites args,
+def delete_finites args
   delete_all = args[:values] == :all
   if delete_all
     args[:values] = []
   end
   modify_finite args do |vs, klass, column_name|
+    MasterTable.add klass.table_name
     if delete_all
       klass.all.each do |o|
         klass.destroy o
@@ -96,7 +52,7 @@ def delete_finites args,
       ActiveRecord::Schema.define do
         drop_table klass.table_name
       end
-      delete_from_master klass.table_name
+      MasterTable.delete klass.table_name
       Object.send 'remove_const', klass.to_s.to_sym
     end
   end
@@ -105,7 +61,7 @@ end
 def modify_finite args
   table_name = args[:in_table]
   if table_name.nil?
-    raise 'A table name must be specified for :in_table .'
+    raise 'A table name must be specified for :in_table.'
   end
   file_name   = args[:from_file] 
   values      = args[:values]
@@ -123,7 +79,7 @@ def modify_finite args
     to_be_modified = to_be_modified.concat JSON.load open file_name
   end
 
-  klass = get_finite_table table_name
+  klass = get_table table_name
   ActiveRecord::Base.transaction do
     yield to_be_modified, klass, column_name
   end
@@ -132,3 +88,7 @@ end
 def default_column_name
   :value
 end
+
+def as_class_name table_name
+  table_name.to_s.singularize.capitalize.to_sym
+end

data/lib/get_table.rb

@@ -0,0 +1,13 @@
+require 'active_record'
+
+def get_table sym, *args
+  class_name = as_class_name sym
+  class_not_defined = not(Object.const_defined? class_name)
+  should_force = args.any? {|x| x == :force}
+  if class_not_defined or should_force
+    anon = Class.new ActiveRecord::Base
+    Object.const_set class_name, anon
+  else
+    Object.const_get class_name
+  end
+end

data/lib/master_table.rb

@@ -0,0 +1,49 @@
+require_relative 'get_table.rb'
+
+module MasterTable
+  def self.table_name
+    :active_finites
+  end
+  def self.column_name
+    :value
+  end
+  def self.table
+    get_table self.table_name
+  end
+  def self.all
+    if self.table.table_exists?
+      self.table
+      .all
+      .collect {|x| x.send default_column_name.to_s}
+      .collect {|x| get_table x}
+    else
+      []
+    end
+  end
+  def self.add table_name
+    if not self.table.table_exists?
+      ActiveRecord::Schema.define do
+        create_table MasterTable.table_name do |t|
+          t.string MasterTable.column_name, :null => false
+        end
+        add_index MasterTable.table_name, MasterTable.column_name, :unique => true
+      end
+    end
+    if self.table.where(self.column_name => table_name).empty?
+      new_finite = self.table.new
+      new_finite.send self.column_name.to_s + '=', table_name
+      new_finite.save
+    end
+  end
+  def self.delete table_name
+    matches = self.table.where self.column_name => table_name
+    matches.each do |m|
+      self.table.destroy m
+    end
+    if self.table.count.eql? 0
+      ActiveRecord::Schema.define do
+        drop_table MasterTable.table_name
+      end
+    end
+  end
+end

data/spec/active_finite_spec.rb

@@ -8,25 +8,25 @@ def reconnect
     :timeout  => 5000)
 end
 
-describe 'get_finite_table' do
+describe 'get_table' do
   before :each do
     reconnect
   end
   it 'returns a class that is a child of active record base' do
-    get_finite_table(:test).superclass.should eql ActiveRecord::Base
+    get_table(:test).superclass.should eql ActiveRecord::Base
   end
   it 'brings a class into scope' do
-    get_finite_table :spaces
+    get_table :spaces
     Object.const_defined?(:Space).should be true
   end
   it 'will not redefine a previously defined constant' do
     Define = true
-    get_finite_table :defines
+    get_table :defines
     Define.should == true
   end
   it 'will redefine a previously defined constant with the force option' do
     Anyway = true
-    get_finite_table :anyways, :force
+    get_table :anyways, :force
     Anyway.should_not == true
   end
 end
@@ -45,12 +45,41 @@ describe 'all_finite_tables' do
     delete_finites in_table: :things, values: ['1']
     all_finite_tables.should == []
   end
+  it 'returns a table that was used with add_finites' do
+    ActiveRecord::Schema.define do
+      create_table :things do |t|
+        t.string :column, :null => false
+      end
+    end
+    add_finites in_table: :things,
+                column_name: :column,
+                values: ['1']
+
+    all_finite_tables.should == [Thing]
+  end
+  it 'returns a table that was used with delete_finites' do
+    ActiveRecord::Schema.define do
+      create_table :things do |t|
+        t.string :column, :null => false
+      end
+    end
+    t = Thing.new 
+    t.column = "hi"
+    t.save
+
+    u = Thing.new
+    u.column = "bye"
+    u.save
+    
+    delete_finites in_table: :things,
+                   column_name: :column,
+                   values: ["bye"]
+
+    all_finite_tables.should == [Thing]
+  end
 end
 
 describe 'as_class_name' do
-  before :each do
-    reconnect
-  end
   it 'capitalizes its input' do
     as_class_name(:as).should eql :A
   end
@@ -105,13 +134,18 @@ describe 'add_finites' do
       add_finites in_table: :wu_members, values: ['rza', 'gza', nil]
     rescue
       ['rza', 'gza'].each do |w|
-        get_finite_table(:wu_members).where(default_column_name => w).should nil
+        get_table(:wu_members).where(default_column_name => w).should nil
       end
     end
   end
+  it 'will not add a duplicate value' do
+    lambda do
+      add_finites(in_table: :numbers, values: ['1','1'])
+    end.should raise_error ActiveRecord::RecordNotUnique
+  end
 end
 
-describe 'delete_finies' do
+describe 'delete_finites' do
   before :each do
     reconnect
   end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'active_finite'
-require 'active_support/core_ext'
+require 'active_record'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -2,7 +2,7 @@
 name: active_finite
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - me
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -04:00
+date: 2011-04-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,8 @@ files:
 - Rakefile
 - VERSION
 - lib/active_finite.rb
+- lib/get_table.rb
+- lib/master_table.rb
 - spec/active_finite_spec.rb
 - spec/spec_helper.rb
 - spec/villans.json
@@ -113,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 138921425
+      hash: 611629043
       segments: 
       - 0
       version: "0"