ts-xml 0.0.1 → 1.0.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Edgars Beigarts
+Copyright (c) 2010 Edgars Beigarts
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -1,18 +1,18 @@
-h1. Support for Oracle, SQLite3 using xmlpipe2 for Thinking Sphinx
+h1. Thinking Sphinx plugin for xmlpipe2 data sources
+
+Supports Oracle 10g, MySQL and SQLite3.
 
 h2. Installation
 
-You'll need Thinking Sphinx 1.3.0 or later.
+You'll need Thinking Sphinx 1.3.8 or later.
 
-<pre><code>gem install ts-xml --source http://gemcutter.org</code></pre>
+<pre><code>gem install ts-xml</code></pre>
 
 In your @environment.rb@ file, with the rest of your gem dependencies:
 
-<pre><code>config.gem 'ts-xml',
-  :lib     => 'thinking_sphinx/xml'
-  :source  => 'http://gemcutter.org'</code></pre>
+<pre><code>config.gem 'ts-xml', :lib => 'thinking_sphinx/xml'</code></pre>
 
-And add the following line to the bottom of your @Rakefile@:
+And add the following lines to the bottom of your @Rakefile@:
 
 <pre><code>begin
   require 'thinking_sphinx/tasks'
@@ -23,8 +23,8 @@ end</code></pre>
 
 h2. Usage
 
-TODO
+Just add those lines and it will use xmlpipe2 data source instead of SQL data source.
 
 h2. Copyright
 
-Copyright (c) 2009 Edgars Beigarts, and released under an MIT Licence.
+Copyright (c) 2010 Edgars Beigarts, and released under an MIT Licence.

data/lib/thinking_sphinx/xml/adapters/oracle_adapter.rb

@@ -21,8 +21,12 @@ module ThinkingSphinx
       "TO_CHAR(#{clause})"
     end
     
+    # Works the same way as described here:
+    # http://github.com/freelancing-god/thinking-sphinx/issues#issue/13
+    #
+    # With oracle_enhanced you can specify "time_zone" in database.yml
     def cast_to_datetime(clause)
-      "(TO_DATE(TO_CHAR(#{clause}, 'YYYY-MON-DD HH24.MI.SS'), 'YYYY-MON-DD HH24.MI.SS') - TO_DATE('01-JAN-1970','DD-MON-YYYY')) * (86400)"
+      "((SYSDATE + (#{clause} - timestamp '1970-01-01 00:00:00 +00:00') - SYSDATE) * 86400)"
     end
     
     def cast_to_unsigned(clause)
@@ -39,7 +43,6 @@ module ThinkingSphinx
       value ? '1' : '0'
     end
     
-    # TODO
     def crc(clause, blank_to_null = false)
       "CRC32(#{clause})"
     end

data/lib/thinking_sphinx/xml/tasks.rb

@@ -1,10 +1,18 @@
-require 'thinking_sphinx'
-require 'thinking_sphinx/xml'
-
 namespace :thinking_sphinx do
   # http://www.sphinxsearch.com/docs/current.html#xmlpipe2
   desc "Streams XML data to STDOUT"
-  task :xml => :app_env do
+  task :xml do
+    # Load app environment.
+    # Redirect STDOUT ("**Erubis 2.6.5" etc) to STDERR.
+    begin
+      _stdout = STDOUT.clone
+      STDOUT.reopen(STDERR)
+      Rake::Task["thinking_sphinx:app_env"].invoke
+    ensure
+      STDOUT.reopen(_stdout)
+    end
+    require 'thinking_sphinx'
+    require 'thinking_sphinx/xml'
     # ThinkingSphinx::Configuration.instance.load_models
     source_name = ENV["NAME"]
     # STDERR.puts "Source name: #{source_name}"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ts-xml
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Edgars Beigarts
@@ -9,49 +14,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +02:00
+date: 2010-02-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 8
         version: 1.3.8
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Support for Oracle, SQLite3 using xmlpipe2 for Thinking Sphinx
 email: 1@wb4.lv
 executables: []
@@ -83,101 +100,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Thinking Sphinx - XML
 test_files: 
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.feature
-- features/extensible_delta_indexing.feature
-- features/facets.feature
-- features/facets_across_model.feature
-- features/handling_edits.feature
-- features/retry_stale_indexes.feature
-- features/searching_across_models.feature
-- features/searching_by_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
-- features/step_definitions/alpha_steps.rb
-- features/step_definitions/beta_steps.rb
-- features/step_definitions/common_steps.rb
-- features/step_definitions/extensible_delta_indexing_steps.rb
-- features/step_definitions/facet_steps.rb
-- features/step_definitions/find_arguments_steps.rb
-- features/step_definitions/gamma_steps.rb
-- features/step_definitions/scope_steps.rb
-- features/step_definitions/search_steps.rb
-- features/step_definitions/sphinx_steps.rb
-- features/sti_searching.feature
-- features/support/database.example.yml
-- features/support/db/fixtures/alphas.rb
-- features/support/db/fixtures/authors.rb
-- features/support/db/fixtures/betas.rb
-- features/support/db/fixtures/boxes.rb
-- features/support/db/fixtures/categories.rb
-- features/support/db/fixtures/cats.rb
-- features/support/db/fixtures/comments.rb
-- features/support/db/fixtures/developers.rb
-- features/support/db/fixtures/dogs.rb
-- features/support/db/fixtures/extensible_betas.rb
-- features/support/db/fixtures/foxes.rb
-- features/support/db/fixtures/gammas.rb
-- features/support/db/fixtures/people.rb
-- features/support/db/fixtures/posts.rb
-- features/support/db/fixtures/robots.rb
-- features/support/db/fixtures/tags.rb
-- features/support/db/migrations/create_alphas.rb
-- features/support/db/migrations/create_animals.rb
-- features/support/db/migrations/create_authors.rb
-- features/support/db/migrations/create_authors_posts.rb
-- features/support/db/migrations/create_betas.rb
-- features/support/db/migrations/create_boxes.rb
-- features/support/db/migrations/create_categories.rb
-- features/support/db/migrations/create_comments.rb
-- features/support/db/migrations/create_developers.rb
-- features/support/db/migrations/create_extensible_betas.rb
-- features/support/db/migrations/create_gammas.rb
-- features/support/db/migrations/create_people.rb
-- features/support/db/migrations/create_posts.rb
-- features/support/db/migrations/create_robots.rb
-- features/support/db/migrations/create_taggings.rb
-- features/support/db/migrations/create_tags.rb
-- features/support/env.rb
-- features/support/lib/generic_delta_handler.rb
-- features/support/models/alpha.rb
-- features/support/models/animal.rb
-- features/support/models/author.rb
-- features/support/models/beta.rb
-- features/support/models/box.rb
-- features/support/models/cat.rb
-- features/support/models/category.rb
-- features/support/models/comment.rb
-- features/support/models/developer.rb
-- features/support/models/dog.rb
-- features/support/models/extensible_beta.rb
-- features/support/models/fox.rb
-- features/support/models/gamma.rb
-- features/support/models/person.rb
-- features/support/models/post.rb
-- features/support/models/robot.rb
-- features/support/models/tag.rb
-- features/support/models/tagging.rb
 - spec/cucumber_env.rb

data/features/alternate_primary_key.feature

@@ -1,27 +0,0 @@
-Feature: Searching on a single model
-  In order to use search models with non-integer primary keys
-  A developer
-  Should be able to search on a single model
-  
-  Scenario: Searching using a basic query
-    Given Sphinx is running
-    And I am searching on robots
-    When I search for Sizzle
-    Then I should get 2 results
-  
-  Scenario: Searching using another basic query
-    Given Sphinx is running
-    And I am searching on robots
-    When I search for fritz
-    Then I should get 1 result
-  
-  Scenario: Deleting an instance
-    Given Sphinx is running
-    And I am searching on robots
-    When I search for Expendable
-    Then I should get 1 result
-    
-    When I destroy robot Expendable
-    And I wait for Sphinx to catch up
-    And I search for Expendable
-    Then I should get 0 results

data/features/attribute_transformation.feature

@@ -1,22 +0,0 @@
-Feature: Handle not-quite-supported column types as attributes
-  In order for Thinking Sphinx to be more understanding with model structures
-  The plugin
-  Should be able to use translatable columns as attributes
-  
-  Scenario: Decimals as floats
-    Given Sphinx is running
-    And I am searching on alphas
-    When I filter between 1.0 and 3.0 on cost
-    Then I should get 2 results
-  
-  Scenario: Dates as Datetimes
-    Given Sphinx is running
-    And I am searching on alphas
-    When I filter between 1 and 3 days ago on created_on
-    Then I should get 2 results
-  
-  Scenario: Timestamps as Datetimes
-    Given Sphinx is running
-    And I am searching on alphas
-    When I filter between 1 and 3 days ago on created_at
-    Then I should get 2 results

data/features/attribute_updates.feature

@@ -1,39 +0,0 @@
-Feature: Update attributes directly to Sphinx
-  In order for updates to be more seamless
-  The plugin
-  Should update Sphinx's attributes where possible
-  
-  Scenario: Updating attributes in Sphinx without delta indexes
-    Given Sphinx is running
-    And I am searching on alphas
-    When I filter by 3 on value
-    Then I should get 1 result
-    
-    When I change the value of alpha four to 13
-    And I wait for Sphinx to catch up
-    And I filter by 13 on value
-    And I use index alpha_core
-    Then I should get 1 result
-    When I use index alternative_core
-    Then I should get 1 result
-    
-    When I change the value of alpha four to 4
-    And I wait for Sphinx to catch up
-    And I filter by 13 on value
-    And I use index alpha_core
-    Then I should get 0 results
-    When I use index alternative_core
-    Then I should get 0 result
-
-  Scenario: Updating attributes in Sphinx with delta indexes
-    Given Sphinx is running
-    And I am searching on betas
-    When I filter by 8 on value
-    Then I should get 1 result
-    
-    When I change the value of beta eight to 18
-    And I filter by 18 on value
-    Then I should get 1 result
-    
-    When I search for the document id of beta eight in the beta_delta index
-    Then it should not exist

data/features/deleting_instances.feature

@@ -1,67 +0,0 @@
-Feature: Keeping Sphinx in line with deleted model instances
-  In order to avoid deleted items being returned by Sphinx
-  Thinking Sphinx
-  Should keep deleted items out of search results
-  
-  Scenario: Deleting instances from the core index
-    Given Sphinx is running
-    And I am searching on betas
-    When I search for three
-    Then I should get 1 result
-    
-    When I destroy beta three
-    And I wait for Sphinx to catch up
-    And I search for three
-    Then I should get 0 results
-  
-  Scenario: Deleting subclasses when the parent class is indexed
-    Given Sphinx is running
-    And I am searching on cats
-    When I search for moggy
-    Then I should get 1 result
-    
-    When I destroy cat moggy
-    And I wait for Sphinx to catch up
-    And I search for moggy
-    Then I should get 0 results
-  
-  Scenario: Deleting created instances from the delta index
-    Given Sphinx is running
-    And I am searching on betas
-    When I create a new beta named eleven
-    And I wait for Sphinx to catch up
-    And I search for eleven
-    Then I should get 1 result
-    
-    When I destroy beta eleven
-    And I wait for Sphinx to catch up
-    And I search for eleven
-    Then I should get 0 results
-  
-  Scenario: Deleting edited instances from the delta index
-    Given Sphinx is running
-    And I am searching on betas
-    When I change the name of beta four to fourteen
-    And I wait for Sphinx to catch up
-    And I search for fourteen
-    Then I should get 1 result
-    
-    When I destroy beta fourteen
-    And I wait for Sphinx to catch up
-    And I search for fourteen
-    Then I should get 0 results
-
-  Scenario: Deleting created instances from the delta index when deltas are disabled
-    Given Sphinx is running
-    And I am searching on betas
-    When I create a new beta named thirteen
-    And I wait for Sphinx to catch up
-    And I search for thirteen
-    Then I should get 1 result
-    
-    And I disable delta updates
-    And I destroy beta thirteen
-    And I wait for Sphinx to catch up
-    And I enable delta updates
-    And I search for thirteen
-    Then I should get 0 results