flex 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/flex.rb

@@ -27,7 +27,7 @@ require 'flex/template/slim_search'
 require 'flex/template/tags'
 require 'flex/template/info'
 
-require 'flex/model_manager'
+require 'flex/manager'
 
 require 'flex/class_proxy/base'
 require 'flex/class_proxy/loader'

data/lib/flex/api_methods.yml

@@ -1,4 +1,4 @@
-# These methods are available as Flex.<method> variable_hash
+# These methods are available as Flex.<method>(variable_hash)
 # you can get the updated full reference and usage example of these methods
 # by just doing in the console:
 # >> puts Flex.info
@@ -87,7 +87,7 @@ store: &store
 # alias for symmetry with post_store
 put_store: *store
 
-# id is set by ES; you must pass :data
+# id is assigned by ES; you must pass :data
 post_store:
   - POST
   - /<<index>>/<<type>>

data/lib/flex/class_proxy/loader.rb

@@ -16,7 +16,7 @@ module Flex
       def load_source_for(klass, source, source_vars)
         if source.nil? || source != /\n/
           paths = [ "#{Configuration.flex_dir}/#{source}.yml",
-                    "#{Configuration.flex_dir}/#{ModelManager.class_name_to_type(host_class.name)}.yml",
+                    "#{Configuration.flex_dir}/#{Manager.class_name_to_type(host_class.name)}.yml",
                     source.to_s ]
           source = paths.find {|p| File.exist?(p)}
         end

data/lib/flex/class_proxy/model.rb

@@ -9,7 +9,7 @@ module Flex
       def initialize(base)
         super
         variables.add :index => Configuration.variables[:index],
-                      :type  => ModelManager.class_name_to_type(host_class.name)
+                      :type  => Manager.class_name_to_type(host_class.name)
       end
 
       def index
@@ -30,7 +30,7 @@ module Flex
 
       def parent(parent_association, map)
         @parent_association = parent_association
-        ModelManager.parent_types |= map.keys.map(&:to_s)
+        Manager.parent_types |= map.keys.map(&:to_s)
         self.type = map.values.map(&:to_s)
         @parent_child_map = map
         @is_child         = true

data/lib/flex/http_clients/patron.rb

@@ -3,8 +3,8 @@ module Flex
     module Patron
       extend self
 
-      def request(method, path, data=nil, options={})
-        options = Utils.deep_merge_hashes(Configuration.http_client_options, options)
+      def request(method, path, data=nil)
+        options = Configuration.http_client_options
         options = options.merge(:data => data) if data
         session.request method.to_s.downcase.to_sym, path, {}, options
       rescue ::Patron::TimeoutError

data/lib/flex/http_clients/rest_client.rb

@@ -3,9 +3,9 @@ module Flex
     module RestClient
       extend self
 
-      def request(method, path, data=nil, options={})
-        options = Configuration.http_client_options.merge options
-        url     = Configuration.base_uri + path
+      def request(method, path, data=nil)
+        options = Configuration.http_client_options
+        url     = Configuration.base_uri.join(path)
         args    = options.merge( :method  => method.to_s.downcase.to_sym,
                                  :url     => url,
                                  :payload => data )

data/lib/flex/instance_proxy/model.rb

@@ -65,7 +65,7 @@ module Flex
       end
 
       def is_parent?
-        @is_parent ||= ModelManager.parent_types.include?(type)
+        @is_parent ||= Manager.parent_types.include?(type)
       end
 
       def metainfo

data/lib/flex/manager.rb

@@ -0,0 +1,61 @@
+module Flex
+  module Manager
+
+    extend self
+
+    attr_accessor :parent_types
+    @parent_types = []
+
+    def init_models
+      Configuration.flex_models.each {|m| eval"::#{m}" if m.is_a?(String) }
+    end
+
+    # arrays of all the types
+    def types
+      type_class_map.keys.map{|k| k.split('/').last}
+    end
+
+    # sets the default parent/child mappings and merges with the config_file
+    # returns the indices structure used for creating the indices
+    def indices(file=Configuration.config_file)
+      @indices ||= ( default = {}.extend Structure::Mergeable
+                     Configuration.flex_models.each do |m|
+                       m = eval"::#{m}" if m.is_a?(String)
+                       next unless m.flex.is_child?
+                       index = m.flex.index
+                       m.flex.parent_child_map.each do |parent, child|
+                         default.add index => {'mappings' => {child => {'_parent' => {'type' => parent }}}}
+                       end
+                     end
+                     hash = YAML.load(Utils.erb_process(file))
+                     hash.delete('ANCHORS')
+                     default.deep_merge(hash) )
+    end
+
+    # maps all the index/types to the ruby class
+    def type_class_map
+      @type_class_map ||= ( map = {}
+                            Configuration.flex_models.each do |m|
+                              m = eval("::#{m}") if m.is_a?(String)
+                              types = m.flex.type.is_a?(Array) ? m.flex.type : [m.flex.type]
+                              types.each do |t|
+                                map["#{m.flex.index}/#{t}"] = m
+                              end
+                            end
+                            map )
+    end
+
+    def class_name_to_type(class_name)
+      type = class_name.tr(':', '_')
+      type.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      type.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      type.downcase!
+      type
+    end
+
+    def type_to_class_name(type)
+      type.gsub(/__(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    end
+
+  end
+end

data/lib/flex/rails/helper.rb

@@ -8,7 +8,7 @@ module Flex
         Flex::Configuration.logger = ::Rails.logger
         # we need to reload the flex API methods with the new variables
         Flex.reload!
-        Flex::ModelManager.init
+        Flex::Manager.init_models
       end
 
     end

data/lib/flex/result/document.rb

@@ -23,7 +23,7 @@ module Flex
       end
 
       def mapped_class(should_raise=false)
-        @mapped_class ||= ModelManager.type_class_map["#{_index}/#{_type}"]
+        @mapped_class ||= Manager.type_class_map["#{_index}/#{_type}"]
       rescue NameError
         raise DocumentMappingError, "the '#{_index}/#{_type}' document cannot be mapped to any class." \
               if should_raise

data/lib/flex/tasks.rb

@@ -93,7 +93,7 @@ module Flex
   private
 
     def indices
-      indices = ENV['INDEX'] || ENV['INDICES'] || struct.keys
+      indices = ENV['INDICES'] || struct.keys
       indices = eval(indices) if indices.is_a?(String)
       indices = [indices] unless indices.is_a?(Array)
       indices
@@ -110,15 +110,15 @@ module Flex
                                          'Please, use CONFIG_FILE=/path/to/index.yml ' +
                                          'or set the Flex::Configuration.config_file properly' \
                           unless File.exist?(@indices_yaml)
-                    ModelManager.indices(@indices_yaml)
+                    Manager.indices(@indices_yaml)
                   end
     end
 
 
     def models
       @models ||= begin
-        mods = ENV['MODEL'] || ENV['MODELS'] || Flex::Configuration.flex_models
-        raise AgrumentError, 'no class defined. Please use MODEL=AClass or MODELS=[ClassA,ClassB]' +
+        mods = ENV['MODELS'] || Flex::Configuration.flex_models
+        raise AgrumentError, 'no class defined. Please use MODELS=[ClassA,ClassB]' +
                              'or set the Flex::Configuration.flex_models properly' \
               if mods.nil? || mods.empty?
         mods = eval(mods) if mods.is_a?(String)

data/lib/flex/utility_methods.rb

@@ -1,11 +1,6 @@
 module Flex
   module UtilityMethods
 
-    def configuration
-      Configuration
-    end
-    alias_method :config, :configuration
-
     # Anonymous search query: please, consider to use named templates for better performances and programming style
     # data can be a JSON string that will be passed as is, or a YAML string (that will be converted into a ruby hash)
     # or a hash. It can contain interpolation tags as usual.

data/lib/generators/flex/setup/setup_generator.rb

@@ -2,9 +2,6 @@ require 'prompter'
 
 class Flex::SetupGenerator < Rails::Generators::Base
 
-  # more funny than vanilla thor
-  include Prompter::Methods
-
   source_root File.expand_path('../templates', __FILE__)
 
   def self.banner
@@ -12,8 +9,8 @@ class Flex::SetupGenerator < Rails::Generators::Base
   end
 
   def ask_base_name
-    @class_name = ask('Please, enter a class name for your Search class. Choose a name not defined in your app.',
-                      :default => 'FlexSearch', :hint => '[<enter>=FlexSearch]')
+    @class_name = Prompter.ask('Please, enter a class name for your Search class. Choose a name not defined in your app.',
+                               :default => 'FlexSearch', :hint => '[<enter>=FlexSearch]')
     @extender_name = "#{@class_name}Extender"
   end
 

data/lib/tasks/index.rake

@@ -9,15 +9,9 @@ namespace :flex do
   task(:import => env) { Flex::Tasks.import_models }
 
   desc 'create indices from the Flex::Configuration.config_file file'
-  task(:create_index => env) { Flex::Tasks.create_indices }
-
-  desc 'alias for flex:create_index'
   task(:create_indices => env) { Flex::Tasks.create_indices }
 
   desc 'destroy indices in the Flex::Configuration.config_file file'
-  task(:delete_index => env) { Flex::Tasks.delete_indices }
-
-  desc 'alias for flex:delete_index'
   task(:delete_indices => env) { Flex::Tasks.delete_indices }
 
 end

data/test/flex.irt

@@ -7,7 +7,7 @@ methods =  [ # api methods from yaml
              :indices_exists, :create_index, :put_index, :post_index, :get_settings, :put_mapping, :get_mapping, :delete_mapping,
              :delete_index, :delete_by_query, :bulk, :count, :stats, :store, :put_store, :post_store, :remove, :get, :multi_get,
              # utility_methods
-             :configuration, :config, :search, :slim_search, :HEAD, :GET, :PUT, :POST, :DELETE, :json2yaml, :yaml2json,
+             :search, :slim_search, :HEAD, :GET, :PUT, :POST, :DELETE, :json2yaml, :yaml2json,
              :process_bulk, :import_collection, :delete_collection,
              # other methods
              :exist? ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flex
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70336369278160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
+  version_requirements: *70336369278160
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70336369277440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
+  version_requirements: *70336369277440
 - !ruby/object:Gem::Dependency
   name: prompter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70336369276780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.5
+  version_requirements: *70336369276780
 - !ruby/object:Gem::Dependency
   name: irt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70336369276080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 1.2.10
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.10
+  version_requirements: *70336369276080
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70336369275480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 0.4.18
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.18
+  version_requirements: *70336369275480
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70336369275020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,12 +76,7 @@ dependencies:
         version: 1.6.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.7
+  version_requirements: *70336369275020
 description: ! 'Flex is an innovative ruby client for ElasticSearch. With Flex your
   code will be clean, easy to write and read, and very short: "poetic-short". Flex
   is fast and efficient, easy to use and customize, and offers ActiveRecord, MongoId
@@ -139,8 +109,8 @@ files:
 - lib/flex/instance_proxy/related_model.rb
 - lib/flex/loader.rb
 - lib/flex/logger.rb
+- lib/flex/manager.rb
 - lib/flex/model.rb
-- lib/flex/model_manager.rb
 - lib/flex/rails.rb
 - lib/flex/rails/engine.rb
 - lib/flex/rails/helper.rb
@@ -204,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Client for ElasticSearch

data/lib/flex/model_manager.rb

@@ -1,65 +0,0 @@
-module Flex
-  module ModelManager
-
-    extend self
-
-    attr_accessor :parent_types
-    @parent_types = []
-
-    def init
-      Configuration.flex_models.each {|m| eval"::#{m}" if m.is_a?(String) }
-    end
-
-    # arrays of all the types
-    def types
-      type_class_map.keys.map{|k| k.split('/').last}
-    end
-
-    # sets the default parent/child mappings and merges with the config_file
-    # returns the indices structure used for creating the indices
-    def indices(file=Configuration.config_file)
-      @indices ||= begin
-        default = {}.extend Structure::Mergeable
-        Configuration.flex_models.each do |m|
-          m = eval"::#{m}" if m.is_a?(String)
-          next unless m.flex.is_child?
-          index = m.flex.index
-          m.flex.parent_child_map.each do |parent, child|
-            default.add index => {'mappings' => {child => {'_parent' => {'type' => parent }}}}
-          end
-        end
-        hash = YAML.load(Utils.erb_process(file))
-        hash.delete('ANCHORS')
-        default.deep_merge(hash)
-      end
-    end
-
-    # maps all the index/types to the ruby class
-    def type_class_map
-      @type_class_map ||= begin
-        map = {}
-        Configuration.flex_models.each do |m|
-          m = eval("::#{m}") if m.is_a?(String)
-          types = m.flex.type.is_a?(Array) ? m.flex.type : [m.flex.type]
-          types.each do |t|
-            map["#{m.flex.index}/#{t}"] = m
-          end
-        end
-        map
-      end
-    end
-
-    def class_name_to_type(class_name)
-      type = class_name.tr(':', '_')
-      type.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-      type.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      type.downcase!
-      type
-    end
-
-    def type_to_class_name(type)
-      type.gsub(/__(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    end
-
-  end
-end