lucid_works 0.6.13 → 0.6.14

data/lib/lucid_works.rb

@@ -6,13 +6,10 @@ end
 require 'active_model'
 require 'active_support/core_ext'
 require 'active_support/inflector'
-begin
-  require 'action_view/helpers/number_helper' # Optional formatter support
-rescue LoadError
-end
 require 'restclient'
 require 'json'
 require 'rsolr'
+require 'rsolr-ext'
 require 'nokogiri'
 
 require 'lucid_works/utils'
@@ -55,3 +52,4 @@ require 'lucid_works/logs/index/summary'
 require 'lucid_works/version'
 
 I18n.load_path += Dir.glob(File.join(File.dirname(__FILE__), '..', 'config', 'locales', '*.yml'))
+I18n.reload! if Rails.env == 'development' rescue nil

data/lib/lucid_works/associations.rb

@@ -113,7 +113,7 @@ module LucidWorks
 
         class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{resource}
-            @#{resource}_association ||= HasOne.new(self, #{resource_class_name}, #{options.to_s})
+            @#{resource}_association ||= Associations::HasOne.new(self, #{resource_class_name}, #{options.to_s})
           end
 
           def #{resource}!
@@ -137,7 +137,7 @@ module LucidWorks
 
         class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{resources}(options={})
-            @#{resources}_association ||= HasMany.new(self, #{resource_class_name}, #{options.to_s})
+            @#{resources}_association ||= Associations::HasMany.new(self, #{resource_class_name}, #{options.to_s})
             @#{resources}_association.remember_find_options(options) unless options.empty?
             @#{resources}_association
           end

data/lib/lucid_works/base.rb

@@ -66,7 +66,7 @@ module LucidWorks
       #   end
 
       def schema(&block)
-        @schema ||= Schema.new
+        @schema ||= LucidWorks::Schema.new
         if block_given?
           @schema.instance_eval(&block)
           @schema.create_accessors_for_attributes(self)
@@ -205,7 +205,7 @@ module LucidWorks
                 # [{"history":[...history_models...],"id":372},{"history":[...history_models...],"id":371}]
                 JSON.parse(raw_response).each do |group_of_targets|
                   owner_id = group_of_targets['id']
-                  owner = results_array.detect { |result| result.id == owner_id }
+                  owner = results_array.detect { |result| result.id == owner_id.to_i }
                   targets = group_of_targets[target_name].collect do |target_attrs|
                     target_class.new(target_attrs.merge(:parent => owner, :persisted => true))
                   end

data/lib/lucid_works/collection.rb

@@ -28,16 +28,16 @@ module LucidWorks
       unless @rsolr
         server_uri = self.server.host
         @path_prefix = URI.parse(server_uri).path # The API key
-        @rsolr = RSolr.connect :url => server_uri.dup
+        @rsolr = RSolr::Ext.connect :url => server_uri.dup
       end
       @rsolr
     end
 
     # Perform a Solr search using RSolr
-    def search(search_params={}, options={})
-      page = options[:page] ||= 1
-      per_page = options[:per_page] ||= 10
-      resp = rsolr.paginate page, per_page, "#{@path_prefix}/solr/#{name}/select", :params => search_params
+    def search(search_params={})
+      search_params[:page] ||= 1
+      search_params[:per_page] ||= 10
+      resp = rsolr.find "#{@path_prefix}/solr/#{name}/select", search_params
       if search_params[:wt] == :xml
         data = Nokogiri.XML(resp)
         raise "search received bad XML" unless data.root

data/lib/lucid_works/field.rb

@@ -3,6 +3,21 @@ module LucidWorks
   class Field < Base
     belongs_to :collection
 
+    schema do
+      attribute :name, :string, :primary_key => true, :omit_during_update => true
+      attribute :editable, :boolean, :omit_during_update => true
+      attributes :indexed, :stored, :facet, :include_in_results,
+                 :search_by_default, :highlight, :multi_valued,
+                 :term_vectors, :omit_tf,
+                 :use_for_deduplication, :synonym_expansion,
+                 :index_for_spellcheck, :index_for_autocomplete,
+                 :query_time_stopword_handling,
+                 :use_in_find_similar,
+                 :type => :boolean
+      attribute :default_boost, :integer
+      attributes :field_type, :short_field_boost, :term_vectors, :default_value, :copy_fields, :type => :string
+    end
+
     TYPES = [
       'string',
       'boolean',

data/lib/lucid_works/version.rb

@@ -1,5 +1,5 @@
 module LucidWorks
-  VERSION = "0.6.13"
+  VERSION = "0.6.14"
 
   class Version < Base
   end

data/lucid_works.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rest-client',   '>= 1.6.1'
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'rsolr'
+  s.add_runtime_dependency 'rsolr-ext'
   s.add_runtime_dependency 'nokogiri'
 end

data/spec/lib/lucid_works/collection_spec.rb

@@ -317,16 +317,16 @@ describe LucidWorks::Collection do
         mock_server = double('server', :host => 'http://fake-solr-host.com/fake_access_path')
         @collection.stub(:server) { mock_server }
         @mock_rsolr_client = double("RSolr::Client")
-        RSolr.stub(:connect) { @mock_rsolr_client }
+        RSolr::Ext.stub(:connect) { @mock_rsolr_client }
       end
 
-      it "should respect pagination variables" do
-        @mock_rsolr_client.should_receive(:paginate)
-                          .with(33, 44, '/fake_access_path/solr/collection_to_search/select',
-                                :params => {:q => 'fake_query', :wt => :ruby})
+      it "should pass thru pagination variables" do
+        @mock_rsolr_client.should_receive(:find)
+                          .with('/fake_access_path/solr/collection_to_search/select',
+                                :q => 'fake_query', :wt => :ruby, :page => 33, :per_page => 44)
                           .and_return({})
 
-        @collection.search({:q => 'fake_query', :wt => :ruby}, :page => 33, :per_page => 44)
+        @collection.search(:q => 'fake_query', :wt => :ruby, :page => 33, :per_page => 44)
       end
 
       context "when requesting an XML response" do
@@ -335,16 +335,16 @@ describe LucidWorks::Collection do
         end
 
         it "should call RSolr.get to perform the search" do
-          @mock_rsolr_client.should_receive(:paginate)
-                            .with(1, 10, '/fake_access_path/solr/collection_to_search/select',
-                                  :params => {:q => 'fake_query', :wt => :xml})
+          @mock_rsolr_client.should_receive(:find)
+                            .with('/fake_access_path/solr/collection_to_search/select',
+                                  :q => 'fake_query', :wt => :xml, :page => 1, :per_page => 10)
                             .and_return(@good_xml)
 
           @collection.search(:q => 'fake_query', :wt => :xml)
         end
 
         it "should parse the XML results" do
-          @mock_rsolr_client.stub(:paginate) { @good_xml }
+          @mock_rsolr_client.stub(:find) { @good_xml }
           results = @collection.search(:q => 'fake_query', :wt => :xml)
           results.should be_a(Nokogiri::XML::Document)
           results.root.children.first.text.should == "FooBar"

data/spec/lib/lucid_works/datasource_spec.rb

@@ -297,7 +297,7 @@ describe LucidWorks::Datasource do
 
   describe "#progress" do
     before do
-      @datasource = LucidWorks::Datasource.new(
+      @datasource = LucidWorks::Datasource.create(
         :collection => @collection,
         :crawler => LucidWorks::Datasource::CRAWLERS['file'],
         :type => 'file',

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-06-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: rsolr-ext
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,6 +79,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: Ruby wrapper for the LucidWorks REST API
 email: 
 - sam.pierson@lucidimagination.com