lucid_works 0.6.29 → 0.7.1

data/spec/lib/lucid_works/schema_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe LucidWorks::Schema do
   before do
-    @schema = LucidWorks::Schema.new
+    @mock_model = double('a model')
+    @schema = LucidWorks::Schema.new(@mock_model)
     @schema.instance_eval do
       attribute :astring, :string, :primary_key => true
       attribute :abool, :boolean
@@ -13,53 +14,53 @@ describe LucidWorks::Schema do
   end
 
   describe "#attribute" do
-    before { @schema = LucidWorks::Schema.new }
+    before { @schema = LucidWorks::Schema.new(@mock_model) }
 
-    describe "using default type" do
+    context "using default type" do
       it "should create a string attribute" do
-        @schema.attribute :foo
-        @schema[:foo][:type].should == :string
+        @schema.instance_eval do
+          attribute :foo
+        end
+        @schema[:foo].type.should == :string
       end
     end
 
-    describe "with a bad type" do
-      it "should raise an error" do
-        lambda {
-          @schema.attribute :foo, :badtype
-        }.should raise_error
+    context "with a name that cannot be represented as a ruby identifier" do
+      before do
+        @schema.instance_eval do
+          attribute 'dash-dash', :string
+        end
       end
-    end
 
-    [:string, :integer, :boolean, :iso8601].each do |attr_type|
-      it "should allow type #{attr_type}" do
-        @schema.attribute :foo, attr_type
-        @schema[:foo][:type].should == attr_type
+      it "should map the name to something usable" do
+        @schema.should have_attribute(:dash_dash)
+        @schema[:dash_dash].type.should == :string
       end
     end
   end
 
   describe "instance_eval" do
     it "should process the block in its context and create an attribute list" do
-      @schema.should == {
-        'astring'    => {'type' => :string},
-        'anint'      => {'type' => :integer},
-        'baz'        => {'type' => :integer},
-        'abool'      => {'type' => :boolean},
-        'nullstring' => {'type' => :string, 'nil_when_blank' => true},
-        'time'       => {'type' => :iso8601}
-      }
+      @schema[:astring].type.should == :string
+      @schema[:astring].type.should == :string
+      @schema[:anint].type.should == :integer
+      @schema[:baz].type.should == :integer
+      @schema[:abool].type.should == :boolean
+      @schema[:nullstring].type.should == :string
+      @schema[:nullstring].nil_when_blank?.should be_true
+      @schema[:time].type.should == :iso8601
       @schema.primary_key.should == :astring
     end
   end
 
   describe "#primary_key" do
     it "should default to 'id'" do
-      LucidWorks::Schema.new.primary_key.should == :id
+      LucidWorks::Schema.new(@mock_model).primary_key.should == :id
     end
     
     context "when given an argument" do
       it "should set the primary key to the provided value" do
-        schema = LucidWorks::Schema.new
+        schema = LucidWorks::Schema.new(@mock_model)
         schema.primary_key 'astring'
         schema.primary_key.should == :astring
       end
@@ -68,13 +69,13 @@ describe LucidWorks::Schema do
   
   describe "#dynamic_attributes" do
     it "should default to true" do
-      schema = LucidWorks::Schema.new
+      schema = LucidWorks::Schema.new(@mock_model)
       schema.dynamic_attributes.should be_true
     end
     
     context "when given an argument" do
       it "should set dynamic_attributes to the provided value" do
-        schema = LucidWorks::Schema.new
+        schema = LucidWorks::Schema.new(@mock_model)
         schema.dynamic_attributes false
         schema.dynamic_attributes.should be_false
       end
@@ -179,4 +180,29 @@ describe LucidWorks::Schema do
       @schema.has_attribute?(:not_an_attribute).should be_false
     end
   end
+
+  describe "#reset!" do
+    it "should reset the schema to only those attributes defined via attribute/attributes" do
+      schema = LucidWorks::Schema.new(@mock_model)
+      schema.instance_eval do
+        attributes :original_attr1, :original_attr2, :type => :string
+      end
+      schema.add_attribute(:added_attr1, :string)
+      schema.add_attribute(:added_attr2, :string)
+
+      @mock_model.should respond_to('added_attr1')
+      @mock_model.should respond_to('added_attr1=')
+      @mock_model.should respond_to('added_attr2')
+      @mock_model.should respond_to('added_attr2=')
+
+      schema.reset!
+
+      @mock_model.should_not respond_to('added_attr1')
+      @mock_model.should_not respond_to('added_attr1=')
+      @mock_model.should_not respond_to('added_attr2')
+      @mock_model.should_not respond_to('added_attr2=')
+
+      schema.keys.should == %w{original_attr1 original_attr2}
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,55 +1,8 @@
 require 'lucid_works'
 require 'timecop'
 
-def connect_to_live_server
-  server_uri = ENV['LUCIDWORKS_SERVER_URI']
-  raise "
-         These tests require a real live LucidWorks server,
-         please set LUCIDWORKS_SERVER_URI environment variable,
-         e.g. export LUCIDWORKS_SERVER_URI=http://localhost:8888 " unless server_uri
-  LucidWorks::Server.new(server_uri)
-end
-
-class LucidWorks::Server
-  DUMMY_COLLECTION_NAME = 'collection_that_should_never_exist'
-  DEFAULT_COLLECTION_NAME = 'collection1'
-
-  # Reset set of collections to contain 1 collection with the default name "collection1".
-  #
-  # LWE-CORE will not allow deletion of the last collection, so:
-  #   create a junk empty one
-  #   delete all the others
-  #   create the default one
-  #   delete the junk one
-  #
-  def reset_collections!
-    notes = [ "Resetting all collections:" ]
-
-    collections = self.collections!
-
-    dummy_collection = collections.find { |c| c.name == DUMMY_COLLECTION_NAME }
-    if dummy_collection
-      notes << "Using dummy collection #{dummy_collection.name}"
-      collections.delete_if { |c| c.name == DUMMY_COLLECTION_NAME }
-    else
-      dummy_collection = self.create_collection(:name => DUMMY_COLLECTION_NAME)
-      notes << "Created collection #{dummy_collection.name}"
-    end
-
-    collections.each do |c|
-      # TODO: figure out how to delete and recreate logs collection
-      # For now just don't delete it
-      unless c.name == 'LucidWorksLogs'
-        c.destroy
-        notes << "Deleted collection '#{c.name}'"
-      end
-    end
-
-    default_collection = self.create_collection(:name => DEFAULT_COLLECTION_NAME)
-    notes << "Created collection '#{default_collection.name}'"
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
 
-    dummy_collection.destroy
-    notes << "Deleted collection #{dummy_collection.name}"
-    notes
-  end
+def fixture_path(file)
+  File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', file))
 end

data/spec/support/active_model_lint.rb

@@ -0,0 +1,21 @@
+# https://gist.github.com/639089
+
+# adapted from rspec-rails http://github.com/rspec/rspec-rails/blob/master/spec/rspec/rails/mocks/mock_model_spec.rb
+
+shared_examples_for "ActiveModel" do
+  require 'test/unit/assertions'
+  require 'active_model/lint'
+  include Test::Unit::Assertions
+  include ActiveModel::Lint::Tests
+
+  # to_s is to support ruby-1.9
+  ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+    example m.gsub('_',' ') do
+      send m
+    end
+  end
+
+  def model
+    subject
+  end
+end

data/spec/support/lucid_works.rb

@@ -0,0 +1,52 @@
+def connect_to_live_server
+  server_uri = ENV['LUCIDWORKS_SERVER_URI']
+  raise "
+         These tests require a real live LucidWorks server,
+         please set LUCIDWORKS_SERVER_URI environment variable, e.g.
+           export LUCIDWORKS_SERVER_URI=http://localhost:8888\n" unless server_uri
+  LucidWorks::Server.new(server_uri)
+end
+
+class LucidWorks::Server
+  DUMMY_COLLECTION_NAME = 'collection_that_should_never_exist'
+  DEFAULT_COLLECTION_NAME = 'collection1'
+
+  # Reset set of collections to contain 1 collection with the default name "collection1".
+  #
+  # LWE-CORE will not allow deletion of the last collection, so:
+  #   create a junk empty one
+  #   delete all the others
+  #   create the default one
+  #   delete the junk one
+  #
+  def reset_collections!
+    notes = [ "Resetting all collections:" ]
+
+    collections = self.collections!
+
+    dummy_collection = collections.find { |c| c.name == DUMMY_COLLECTION_NAME }
+    if dummy_collection
+      notes << "Using dummy collection #{dummy_collection.name}"
+      collections.delete_if { |c| c.name == DUMMY_COLLECTION_NAME }
+    else
+      dummy_collection = self.create_collection(:name => DUMMY_COLLECTION_NAME)
+      notes << "Created collection #{dummy_collection.name}"
+    end
+
+    collections.each do |c|
+      # TODO: figure out how to delete and recreate logs collection
+      # For now just don't delete it
+      unless c.name == 'LucidWorksLogs'
+        c.destroy
+        notes << "Deleted collection '#{c.name}'"
+      end
+    end
+
+    default_collection = self.create_collection(:name => DEFAULT_COLLECTION_NAME)
+    notes << "Created collection '#{default_collection.name}'"
+
+    dummy_collection.destroy
+    notes << "Deleted collection #{dummy_collection.name}"
+    notes
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.29
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -04:00
+date: 2011-08-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - lib/lucid_works/associations/proxy.rb
 - lib/lucid_works/base.rb
 - lib/lucid_works/collection.rb
+- lib/lucid_works/collection/click.rb
 - lib/lucid_works/collection/index.rb
 - lib/lucid_works/collection/info.rb
 - lib/lucid_works/collection/settings.rb
@@ -131,9 +132,13 @@ files:
 - lib/lucid_works/datasource/job.rb
 - lib/lucid_works/datasource/schedule.rb
 - lib/lucid_works/datasource/status.rb
+- lib/lucid_works/datasource_property.rb
+- lib/lucid_works/datasource_type.rb
 - lib/lucid_works/exceptions.rb
 - lib/lucid_works/field.rb
+- lib/lucid_works/fieldtype.rb
 - lib/lucid_works/gem_version.rb
+- lib/lucid_works/jdbcdriver.rb
 - lib/lucid_works/logs.rb
 - lib/lucid_works/logs/index.rb
 - lib/lucid_works/logs/index/summary.rb
@@ -141,13 +146,27 @@ files:
 - lib/lucid_works/logs/query/summary.rb
 - lib/lucid_works/patch_restclient.rb
 - lib/lucid_works/patch_time.rb
+- lib/lucid_works/role.rb
 - lib/lucid_works/schema.rb
+- lib/lucid_works/schema/attribute.rb
+- lib/lucid_works/schema/boolean_attribute.rb
+- lib/lucid_works/schema/custom_attribute.rb
+- lib/lucid_works/schema/integer_attribute.rb
+- lib/lucid_works/schema/iso8601_attribute.rb
+- lib/lucid_works/schema/string_attribute.rb
 - lib/lucid_works/server.rb
 - lib/lucid_works/simple_naming.rb
 - lib/lucid_works/synonym.rb
 - lib/lucid_works/utils.rb
 - lib/lucid_works/version.rb
 - lucid_works.gemspec
+- spec/fixtures/fake_file_ds_to_be_deleted/.gitkeep
+- spec/fixtures/fake_file_ds_to_be_updated/.gitkeep
+- spec/fixtures/fake_file_ds_to_get_index_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_get_schedule_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_get_status_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_mess_with_job_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_test_progress/.gitkeep
 - spec/lib/lucid_works/associations/has_many_spec.rb
 - spec/lib/lucid_works/associations/has_one_spec.rb
 - spec/lib/lucid_works/associations_spec.rb
@@ -163,11 +182,15 @@ files:
 - spec/lib/lucid_works/datasource/status_spec.rb
 - spec/lib/lucid_works/datasource_spec.rb
 - spec/lib/lucid_works/field_spec.rb
+- spec/lib/lucid_works/fieldtype_spec.rb
 - spec/lib/lucid_works/patch_time_spec.rb
+- spec/lib/lucid_works/schema/attribute_spec.rb
 - spec/lib/lucid_works/schema_spec.rb
 - spec/lib/lucid_works/server_spec.rb
 - spec/lib/lucid_works/utils_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_model_lint.rb
+- spec/support/lucid_works.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -197,6 +220,13 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for the LucidWorks REST API
 test_files: 
+- spec/fixtures/fake_file_ds_to_be_deleted/.gitkeep
+- spec/fixtures/fake_file_ds_to_be_updated/.gitkeep
+- spec/fixtures/fake_file_ds_to_get_index_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_get_schedule_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_get_status_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_mess_with_job_of/.gitkeep
+- spec/fixtures/fake_file_ds_to_test_progress/.gitkeep
 - spec/lib/lucid_works/associations/has_many_spec.rb
 - spec/lib/lucid_works/associations/has_one_spec.rb
 - spec/lib/lucid_works/associations_spec.rb
@@ -212,8 +242,12 @@ test_files:
 - spec/lib/lucid_works/datasource/status_spec.rb
 - spec/lib/lucid_works/datasource_spec.rb
 - spec/lib/lucid_works/field_spec.rb
+- spec/lib/lucid_works/fieldtype_spec.rb
 - spec/lib/lucid_works/patch_time_spec.rb
+- spec/lib/lucid_works/schema/attribute_spec.rb
 - spec/lib/lucid_works/schema_spec.rb
 - spec/lib/lucid_works/server_spec.rb
 - spec/lib/lucid_works/utils_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_model_lint.rb
+- spec/support/lucid_works.rb