wukong-migrate 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc5OTFjNjUwMzI5NzA2ODViNzZjMTBkYWY4YWE0YTg3Y2I0ZTEzZA==
+    OTYxYmMxOTdkZTkxZTI2ZmE5ODhhYTY5YzViOWU5YzAzMmE3OGQ5NQ==
   data.tar.gz: !binary |-
-    ZDQ3MzMxMjM0MjUzOWI4NzcyYTg4NmFmZmI4NTVmZjYwNmNhNTA0ZQ==
+    Mzk3YWNkOTEzMjQyNWQ1MTQ4ZWRiZjIwYjY5NDE5Yjk1ZWEzNzMwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmY2YTllNDBjY2E5ZjNhYjg2MzA3OGQ0ZTg2YTJkNTQzZDNkMDNiYzQ0MmE5
-    N2Y5OWMxZjE0ZDFiNDhhOTkxYTljNTdmZmUwNWVkZDg2N2ViM2Q4Mzk2YmU4
-    YTIxZDljNjJiMTE2YmUzOWE1OWQwY2NhNjQ3ZTQ3MGMyMjk4ZGM=
+    ZmU2ZWY3MWVkNjA0ZDVhNGM5YjNmZGJiYTQ0ZjIzMmU5Njk0Mzc0MWJiNTM2
+    NjFmY2Q3MTYwZTE3MjY0NDczZWQzMWEzODUwZjhiNmZmYmQ2YjIwM2QwZWY2
+    NzU1OTQwMmM3MDVkMjE0ZTcwZTBkODMxOGJmYjVkYzYwYzM3MWI=
   data.tar.gz: !binary |-
-    ZjI0MDM3OGJkYzM1YTliOTUyZjY3NTQ0NDIzZGRmODJiYjE4OThmMDNmZjc0
-    YjFjNzEzYmZjZDZhZTBjNGUyMDE2MjU2M2FiMWMyNjFiYWY4MGQ1NzhmYmJj
-    NGE4OWUyYzIwMzQ0ZTFmMmRkY2JiZjRmNzBhNmM3NjJjZmM3Njg=
+    MGU5YWE3ZGQzN2NmNzFjOTA0ODE5MjM4NWQ4MzQwMWNjY2Y0ZDJhN2M2MDgz
+    MjY0MTg1ZDAyZTEyYzVjMDkxNTMxYmI2NzJiYWU4YWJhM2Y2NDA5ZGIxNTFj
+    ZThhZDljZjE3MTU1YjY2ZjUzNzQ1YTUxYzhhMjViMTA5Y2EyMWY=

data/.gitignore

@@ -0,0 +1,2 @@
+Gemfile.lock
+pkg/

data/lib/gorillib/model/elasticsearch_ext.rb

@@ -72,19 +72,23 @@ module Gorillib
     
     Field.class_eval do
       field :es_options, Hash
+
+      def congruent?(klass, *others)
+        others.any?{ |o| o.ancestors.include? klass }
+      end
       
       def receive_as_type(factory, params)
-        product = factory.try(:product)
+        products = Array[factory.try(:product) || factory].flatten
         case 
-        when product == Integer
+        when congruent?(Integer, *products)
           EsInteger.receive(params)
-        when product == Float
+        when congruent?(Float, *products)
           EsFloat.receive(params)
-        when product == Date
+        when congruent?(Date, *products) || congruent?(Time, *products)
           EsDate.receive(params)
-        when product == [TrueClass,  FalseClass]
+        when congruent?(TrueClass, *products) || congruent?(FalseClass, *products)
           EsBoolean.receive(params)
-        when product == Array
+        when congruent?(Array, *products)
           receive_as_type(factory.items_factory, params)
         else
           EsString.receive(params)

data/lib/wukong-migrate/elasticsearch_fields.rb

@@ -4,7 +4,7 @@ class EsField
   
   field :index_as,            String,   doc: 'The name of the field that will be stored in the index. Defaults to the property/field name.'
   field :store,               String,   doc: 'Set to yes to store actual field in the index, no to not store it. Defaults to no (note, the JSON document itself is stored, and it can be retrieved from it).'
-  field :index,               :boolean, doc: 'Set to analyzed for the field to be indexed and searchable after being broken down into token using an analyzer. not_analyzed means that its still searchable, but does not go through any analysis process or broken down into tokens. no means that it won’t be searchable at all (as an individual field; it may still be included in _all). Setting to no disables include_in_all. Defaults to analyzed.'
+  field :index,               String,   doc: 'Set to analyzed for the field to be indexed and searchable after being broken down into token using an analyzer. not_analyzed means that its still searchable, but does not go through any analysis process or broken down into tokens. no means that it won’t be searchable at all (as an individual field; it may still be included in _all). Setting to no disables include_in_all. Defaults to analyzed.'
   field :boost,               Float,    doc: 'The boost value. Defaults to 1.0.'
   field :include_in_all,      :boolean, doc: 'Should the field be included in the _all field (if enabled). If index is set to no this defaults to false, otherwise, defaults to true or to the parent object type setting.'
 
@@ -14,16 +14,16 @@ class EsField
 end
 
 class EsString < EsField
-  field :index, String, default: 'not_analyzed', doc: 'Set to analyzed for the field to be indexed and searchable after being broken down into token using an analyzer. not_analyzed means that its still searchable, but does not go through any analysis process or broken down into tokens. no means that it won’t be searchable at all (as an individual field; it may still be included in _all). Setting to no disables include_in_all. Defaults to analyzed.'
-  field :term_vector,         String,   doc: 'Possible values are no, yes, with_offsets, with_positions, with_positions_offsets. Defaults to no.'
-  field :null_value,          String,   doc: 'When there is a (JSON) null value for the field, use the null_value as the field value. Defaults to not adding the field at all.'
-  field :omit_norms,          String,   doc: 'Boolean value if norms should be omitted or not. Defaults to false for analyzed fields, and to true for not_analyzed fields.'
-  field :index_options,       String,   doc: 'Allows to set the indexing options, possible values are docs (only doc numbers are indexed), freqs (doc numbers and term frequencies), and positions (doc numbers, term frequencies and positions). Defaults to positions for analyzed fields, and to docs for not_analyzed fields. Since 0.20.'
-  field :analyzer,            String,   doc: 'The analyzer used to analyze the text contents when analyzed during indexing and when searching using a query string. Defaults to the globally configured analyzer.'
-  field :index_analyzer,      String,   doc: 'The analyzer used to analyze the text contents when analyzed during indexing.'
-  field :search_analyzer,     String,   doc: 'The analyzer used to analyze the field when part of a query string. Can be updated on an existing field.'
-  field :ignore_above,        Integer,  doc: 'The analyzer will ignore strings larger than this size. Useful for generic not_analyzed fields that should ignore long text. (since @0.19.9).'
-  field :position_offset_gap, Integer,  doc: 'Position increment gap between field instances with the same field name. Defaults to 0.'
+  field :index,               String,   default: 'not_analyzed', doc: 'Set to analyzed for the field to be indexed and searchable after being broken down into token using an analyzer. not_analyzed means that its still searchable, but does not go through any analysis process or broken down into tokens. no means that it won’t be searchable at all (as an individual field; it may still be included in _all). Setting to no disables include_in_all. Defaults to analyzed.'
+  field :term_vector,         String,                            doc: 'Possible values are no, yes, with_offsets, with_positions, with_positions_offsets. Defaults to no.'
+  field :null_value,          String,                            doc: 'When there is a (JSON) null value for the field, use the null_value as the field value. Defaults to not adding the field at all.'
+  field :omit_norms,          :boolean, default: true,           doc: 'Boolean value if norms should be omitted or not. Defaults to false for analyzed fields, and to true for not_analyzed fields.'
+  field :index_options,       String,   default: 'docs',         doc: 'Allows to set the indexing options, possible values are docs (only doc numbers are indexed), freqs (doc numbers and term frequencies), and positions (doc numbers, term frequencies and positions). Defaults to positions for analyzed fields, and to docs for not_analyzed fields. Since 0.20.'
+  field :analyzer,            String,                            doc: 'The analyzer used to analyze the text contents when analyzed during indexing and when searching using a query string. Defaults to the globally configured analyzer.'
+  field :index_analyzer,      String,                            doc: 'The analyzer used to analyze the text contents when analyzed during indexing.'
+  field :search_analyzer,     String,                            doc: 'The analyzer used to analyze the field when part of a query string. Can be updated on an existing field.'
+  field :ignore_above,        Integer,                           doc: 'The analyzer will ignore strings larger than this size. Useful for generic not_analyzed fields that should ignore long text. (since @0.19.9).'
+  field :position_offset_gap, Integer,                           doc: 'Position increment gap between field instances with the same field name. Defaults to 0.'
   
   def short_type() 'string'  ; end
 end

data/lib/wukong-migrate/elasticsearch_migration.rb

@@ -38,6 +38,7 @@ class ObjectDsl < EsMigrationDsl
   magic :analyzer_field, String,   doc: 'Specify a field this document should use as an analyzer'
   magic :boost_field,    String,   doc: 'Specify a field this document should use as a boost'
   magic :parent,         String,   doc: 'Specify this documents _parent type'
+  magic :routing,        String,   doc: 'Specify a field this document should use to route'
   
   def mapping_rules
     {}.tap do |rules|
@@ -49,6 +50,7 @@ class ObjectDsl < EsMigrationDsl
       rules[:_analyzer]  = { path: analyzer_field        } if attribute_set?(:analyzer_field)
       rules[:_boost]     = { name: boost_field           } if attribute_set?(:boost_field)
       rules[:_parent]    = { type: parent                } if attribute_set?(:parent)
+      rules[:_routing]   = { path: routing               } if attribute_set?(:routing)
     end
   end
 

data/lib/wukong-migrate/version.rb

@@ -1,5 +1,5 @@
 module Wukong
   module Migrate
-    VERSION = '0.0.1'
+    VERSION = '0.0.3'
   end
 end

data/spec/gorillib/elasticsearch_ext_spec.rb

@@ -13,7 +13,7 @@ describe Gorillib::Model do
       subject.class_eval do
         field :foo, String, es_options: { analyzer: 'whitespace' }
       end
-      subject.to_mapping.should eq({ properties: { foo: { type: 'string', index: 'not_analyzed', analyzer: 'whitespace' } } })
+      subject.to_mapping.should eq({ properties: { foo: { type: 'string', index: 'not_analyzed', analyzer: 'whitespace', omit_norms: true, index_options: 'docs' } } })
     end
 
     it 'generates integer mappings correctly' do
@@ -60,7 +60,7 @@ describe Gorillib::Model do
 
         field :bar, Bar      
       end
-      subject.to_mapping.should eq({ properties: { bar: { properties: { baz: { type: 'string', index: 'not_analyzed' } } } } })
+      subject.to_mapping.should eq({ properties: { bar: { properties: { baz: { type: 'string', index: 'not_analyzed', omit_norms: true, index_options: 'docs' } } } } })
     end
     
     it 'handles non-standard fields as strings' do
@@ -70,7 +70,7 @@ describe Gorillib::Model do
         end
         field :bar, Baz        
       end
-      subject.to_mapping.should eq({ properties: { bar: { type: 'string', index: 'not_analyzed' } } })
+      subject.to_mapping.should eq({ properties: { bar: { type: 'string', index: 'not_analyzed', omit_norms: true, index_options: 'docs' } } })
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wukong-migrate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Travis Dempsey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wukong-deploy
@@ -76,8 +76,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - bin/wu-migrate
 - lib/gorillib/model/elasticsearch_ext.rb

data/Gemfile.lock

@@ -1,67 +0,0 @@
-PATH
-  remote: .
-  specs:
-    wukong-migrate (0.0.1)
-      gorillib (~> 0.5)
-      httparty (~> 0.11)
-      rake (>= 0.8.7)
-      wukong-deploy (>= 0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    configliere (0.4.18)
-      highline (>= 1.5.2)
-      multi_json (>= 1.1)
-    diff-lcs (1.2.4)
-    diffy (3.0.1)
-    erubis (2.7.0)
-    eventmachine (1.0.3)
-    forgery (0.5.0)
-    gorillib (0.5.0)
-      configliere (>= 0.4.13)
-      json
-      multi_json (>= 1.1)
-    highline (1.6.19)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    json (1.8.0)
-    log4r (1.1.10)
-    multi_json (1.7.7)
-    multi_xml (0.5.4)
-    rake (0.9.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    uuidtools (2.1.4)
-    vayacondios-client (0.2.6)
-      configliere (>= 0.4.16)
-      gorillib (>= 0.4.2)
-      multi_json (>= 1.3.6)
-    wukong (3.0.1)
-      configliere (>= 0.4.18)
-      eventmachine
-      forgery
-      gorillib (>= 0.4.2)
-      log4r
-      multi_json (>= 1.3.6)
-      uuidtools
-      vayacondios-client (>= 0.1.2)
-    wukong-deploy (0.1.1)
-      diffy
-      erubis
-      rake (~> 0.9)
-      wukong (= 3.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec (~> 2)
-  wukong-migrate!