pacer-titan 0.0.1-java → 0.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3810e21df640978e98a39ccf84e9fc28be977c
-  data.tar.gz: 3399b781ddc7edb710deb1a8174c726719aa39b8
+  metadata.gz: c638bc7d751817482ad2ffc01c64cf0041974d68
+  data.tar.gz: b72282e9ee400713ff77e081ca336d38144a461b
 SHA512:
-  metadata.gz: bb27e8b12b5b48b73ab5431b86e519ecda849dd56dc9147e5e5e26d74660836029af688240c3d6de62b517d5c5939f2037e4750487740adc650ae5a163f575c0
-  data.tar.gz: 8803d3e557170aea64e42dadf9092f3911cc0e8e3bb345ca349f153bdea0dde6c6209694809160b92f76f57f0b5d32c0c24410893f42a8206381e7ebb4adb8fc
+  metadata.gz: 873a8a7e52f1d6f1d851c862de4e20801310819b38046327bf1d62d21ece8b8c4970e4687ac207ab74553c3dcfa669ca4202a6abbb451f630aefe88086c6197e
+  data.tar.gz: 18c52b483fdfea0e4a94c1d655788c1257104d6d8ff417b4615e73b1f92ea9c35389a04d64a150af4c5266427408321b32004ccda70c172b11edf4da4e59c1de

data/LICENSE.txt

@@ -0,0 +1,24 @@
+Copyright (c) 2010, TinkerPop [http://tinkerpop.com]
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the TinkerPop nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL TINKERPOP BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -5,27 +5,30 @@
 [Tinkerpop](http://www.tinkerpop.com) stack.
 
 This is an alpha-version pacer adapter with basic support for a [Titan](http://thinkaurelius.github.io/titan) graph in Pacer.
-Based on Derrick's pacer-dex and pacer-neo4j gems.
 
 ## Installation
 
-You will need to install Maven first. 
-Clone this repository.
-Run 'rake install' in its directory to build Titan's jars.
-Include the gem in your project's gemfile, directing its path to your cloned copy.
+As always: ```gem 'pacer-titan'```, then you will need to load the jars for your storage backend of choice (see below).
+
+If you want to hack at pacer-titan:
+- You will need to install Maven first. 
+- Clone this repository.
+- Run ```rake install``` in its directory to build Titan's jars.
+- Include the gem in your project's gemfile, directing its path to your cloned copy.
 
 ## Backends
 
 This gem includes Titan 0.4.2 and its dependencies.
 
-It seems embedded backends (embedded Cassandra, embedded ElasticSearch) do not launch without extra work specifying their class paths when launching your app. The stock gem can run a Cassandra graph via the Thrift connector but will balk at not being able to load log4j.
+It seems embedded backends (embedded Cassandra, embedded ElasticSearch) do not launch without extra work specifying their class paths when launching your app.
 
 The excellent [jBundler](https://github.com/mkristian/jbundler) does a great job of this for you, simply add any of the following to your Jarfile as needed:
 
-jar 'org.slf4j:slf4j-log4j12', '~> 1.7.5' # Logging output
+```ruby
 jar 'com.thinkaurelius.titan:titan-es', '~> 0.4.2' # ElasticSearch
-jar 'com.thinkaurelius.titan:titan-cassandra', '~> 0.4.2' # Embedded Cassandra
+jar 'com.thinkaurelius.titan:titan-cassandra', '~> 0.4.2' # Cassandra
 jar 'com.thinkaurelius.titan:titan-berkeleyje', '~> 0.4.2' # BerkeleyDB
+```
 
 You may find your JRuby JVM crashes under heavy load if you include too many jars; increase your -XX:MaxPermSize
 
@@ -33,19 +36,30 @@ You may find your JRuby JVM crashes under heavy load if you include too many jar
 
 Opening a Titan graph in Pacer:
 
-  require 'pacer'
-  require 'pacer-titan'
+```ruby
+require 'pacer'
+require 'pacer-titan'
 
-  g = Pacer.titan 'path/to/titan_config.properties'
+g = Pacer.titan 'path/to/titan_config.properties'
+```
 
 The graph settings are specified in an Apache Configuration .properties file.
 
 ## Titan-specific routes
 
-You can use Titan's query() method in pacer routes.
-  g.query{ has('text', Java::ComThinkaureliusTitanCore::Text::CONTAINS, 'lorem') }.out(:author)
+You can use Titan's [indexing predicates](https://github.com/thinkaurelius/titan/wiki/Indexing-Backend-Overview#querying-an-index) in pacer routes.
+```ruby
+g.query{ has('text', Text::CONTAINS, 'lorem') }.out(:author)
+```
+Be sure to ```import com.thinkaurelius.titan.core.attribute.Text``` for the above example.
 
-You can also use Titan's indexQuery() method to send queries in Lucene syntax to external indices like Elastic:
-  g.index_query(:text, '(lorem ipsum*)', index_name: 'search').out(:author)
+You can also use Titan's indexQuery() method to send queries in Lucene syntax to [external indices](https://github.com/thinkaurelius/titan/wiki/Direct-Index-Query):
+```ruby 
+g.index_query(:text, '(lorem ipsum*)', index_name: 'search').out(:author)
+```
   
-The index_query route can take an array of indices as the first parameter, you can also pass an options hash as the third parameter to specify the index name if it is something other than 'search' as used in most of the Titan configuration examples.
+The index_query route can take an array of indices as the first parameter, you can also pass an options hash as the third parameter to specify the index name if it is something other than 'search' as used in most of the Titan configuration examples.
+
+## License
+Based on Derrick Wiebe's pacer-dex and pacer-neo4j gems, as well as code by Steven McCraw and others on the pacer-users list.
+This gem is released under the liberal MIT license.

data/lib/pacer-titan/graph.rb

@@ -1,28 +1,35 @@
 module Pacer
   module Titan
-    # hack to make indexing work:
-    class FeatureProxy
-      def initialize original_features 
-        @features = original_features 
-      end
+    class Graph < PacerGraph
       
-      def supportsIndices
-        true
+      # Use GraphQuery for index lookups, based on pacer-neo4j's code:
+      private
+      def indexed_route(element_type, filters, block)
+        return super if search_manual_indices
+        
+        filters.graph = self
+        filters.use_lookup!
+        query = indexed_properties(element_type, filters)
+        
+        if query
+          route = exact_query(query, element_type: element_type, extensions: filters.extensions, wrapper: filters.wrapper)
+          
+          filters.remove_property_keys key_indices(element_type)
+          if filters.any?
+            Pacer::Route.property_filter(route, filters, block)
+          else
+            route
+          end
+        elsif filters.route_modules.any?
+          mod = filters.route_modules.shift
+          Pacer::Route.property_filter(mod.route(self), filters, block)
+        end
       end
-      
-      def method_missing(name, *args, &block)
-        @features.public_send(name, *args, &block) 
+            
+      def indexed_properties(type, filters)
+        filters.properties.select { |k, v| key_indices(type).include?(k) and not v.nil? }
       end
-    end
-    
-    class Graph < PacerGraph
-      def features
-        FeatureProxy.new(blueprints_graph.features)
-      end 
       
-      def indices
-        key_indices
-      end
     end
   end
 end

data/lib/pacer-titan/titan_query.rb

@@ -1,10 +1,23 @@
 module Pacer
   module Titan
     class Graph
-      # Use Titan's QueryBuilder to access indexes (replaces g.v(key: value) style index querying
-      # eg: g.query{ has('login', 'ilya').has('description', Text::CONTAINS, 'abc') }.out(:messages)
-      # be sure to java_import com.thinkaurelius.titan.core.attribute.Text for the above example
-      def query(options = { element_type: :vertex }, &query)
+      # Use Titan's QueryBuilder to access indices when you need to specify other comparison predicates
+      # eg: g.query{ has('description', Text::CONTAINS, 'abc').has('login', 'ilya') }.out(:messages)...
+      # be sure to import com.thinkaurelius.titan.core.attribute.Text for the above example
+      def query(options = {}, &query)
+        options[:element_type] ||= :vertex
+        
+        chain_route options.merge(
+          query: query,
+          filter: :titan_query,
+          back: self
+        )
+      end
+      
+      # Pass a hash of properties and values to look for in Titan's standard (exact) index
+      def exact_query(query, options={})
+        options[:element_type] ||= :vertex
+        
         chain_route options.merge(
           query: query,
           filter: :titan_query,
@@ -29,14 +42,34 @@ module Pacer
         
       protected
       
+      def build_graph_centric_vertex_query(properties = {})
+        path = graph.blueprints_graph.query
+        properties.each do |key, value|
+          path = path.has("#{ key }", graph.encode_property(value))
+        end
+        path
+      end
+      
       def query_result
-        path = graph.blueprints_graph.query.instance_exec(&query)
+        if query.is_a?(Array) || query.is_a?(Hash)
+          path = build_graph_centric_vertex_query(query)
+        elsif query.kind_of? Proc
+          path = graph.blueprints_graph.query.instance_exec(&query)
+        else
+          raise "Invalid query type for index lookup (takes a hash or block): #{ query }"
+        end
+        
         path.limit(top) if top
-        path = path.vertices
+        
+        if element_type == :edge
+          path.edges
+        else
+          path.vertices
+        end
       end
       
       def source_iterator
-        query_result.to_route(element_type: :vertex, graph: graph)
+        query_result.to_route(element_type: element_type, graph: graph)
       end
       
       def inspect_string

data/lib/pacer-titan/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   module Titan
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     JAR = "pacer-titan-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"
     BLUEPRINTS_VERSION = "2.4.0"

data/pom.xml

@@ -7,7 +7,7 @@
     <artifactId>pacer-titan</artifactId>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-titan/version.rb -->
     <properties>
-      <gem.version>0.0.1</gem.version>
+      <gem.version>0.0.2</gem.version>
       <blueprints.version>2.4.0</blueprints.version>
       <pipes.version>2.4.0</pipes.version>
       <titan.version>0.4.2</titan.version>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-titan
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: java
 authors:
 - Ilya Kardailsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - config/cassandra-es.properties
@@ -46,7 +47,7 @@ files:
 - pacer-titan.gemspec
 - pom.xml
 - pom/standalone.xml
-- lib/pacer-titan-0.0.1-standalone.jar
+- lib/pacer-titan-0.0.2-standalone.jar
 homepage: http://www.github.com
 licenses: []
 metadata: {}