mark_mapper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8da86f713512ffdee54852951d9e1e2f94c0bf5
-  data.tar.gz: 768ad651bee67d55396095b14db35963387fa9bc
+  metadata.gz: 8c87d8bd021a66b634a321779d977b24fa209d18
+  data.tar.gz: 50c1eef885256e24025205c026d6e4372e7748c4
 SHA512:
-  metadata.gz: b78ac1946be9798b7b53f6299d2164cafd6b941b603584b1aa5ce720ce9139ffe85c5ca7ee00a30b41c00d292b4327b44f01e504ceb9f4c2b383e787446a1715
-  data.tar.gz: 5dfb0ecac9c51de0b446d7466d56e7baedd97fe84f79102126aa21b6938fc194dc3c11fed2023a78749672abc3b473ee5a61750b20f30f037c929874948b084f
+  metadata.gz: df7c6c45d3016151096980251b5c8e49e3484745e55d1a23f0b9b276bdb5c4705262ff900b015b7ee71bbf9b725aa5515daef8c344b8a6a35050516185f7ed20
+  data.tar.gz: c7252b6b400fd3b7d345cc55d759564c88ad8b88b21d780a35ded5859583e00db31c7eefdee6dfb6bf570f0524e190cc87f46a6117c9fe0bc3e12bca78dd443c

data/lib/mark_mapper/connection.rb

@@ -56,5 +56,35 @@ module MarkMapper
       raise 'Set config before connecting. MarkMapper.config = {...}' unless defined?(@@config)
       @@config
     end
+
+    def setup(config, environment, options={})
+      self.config = config
+      connect(environment, options)
+    end
+
+    def connect(environment, options={})
+      raise 'Set config before connecting. MongoMapper.config = {...}' if config.blank?
+      env = config_for_environment(environment)
+
+      MarkLogic::Connection.configure({
+        host: env['host'],
+        default_user: env['username'],
+        default_password: env['password']
+      })
+
+      MarkLogic::Connection.configure(manage_port: env['manage_port']) if env['manage_port']
+      MarkLogic::Connection.configure(admin_port: env['admin_port']) if env['admin_port']
+      MarkLogic::Connection.configure(app_services_port: env['app_services_port']) if env['app_services_port']
+
+      MarkMapper.application = MarkLogic::Application.new(
+        "markmapper-application-test",
+        connection: MarkLogic::Connection.new(env['host'], env['port'])
+      )
+      MarkMapper.application.stale?
+    end
+
+    def config_for_environment(environment)
+      config[environment.to_s] || {}
+    end
   end
 end

data/lib/mark_mapper/railtie.rb

@@ -12,23 +12,15 @@ module MarkMapper
     config.mark_mapper = ActiveSupport::OrderedOptions.new
 
     # Rescue responses similar to ActiveRecord.
-    # For rails 3.0 and 3.1
-    if Rails.version < "3.2"
-      ActionDispatch::ShowExceptions.rescue_responses['MarkMapper::DocumentNotFound']  = :not_found
-      ActionDispatch::ShowExceptions.rescue_responses['MarkMapper::InvalidKey']        = :unprocessable_entity
-      ActionDispatch::ShowExceptions.rescue_responses['MarkMapper::InvalidScheme']     = :unprocessable_entity
-      ActionDispatch::ShowExceptions.rescue_responses['MarkMapper::NotSupported']      = :unprocessable_entity
-    else
-      # For rails 3.2 and 4.0
-      config.action_dispatch.rescue_responses.merge!(
-          'MarkMapper::DocumentNotFound'  => :not_found,
-          'MarkMapper::InvalidKey'        => :unprocessable_entity,
-          'MarkMapper::InvalidScheme'     => :unprocessable_entity,
-          'MarkMapper::NotSupported'      => :unprocessable_entity
-        )
-    end
+    config.action_dispatch.rescue_responses.merge!(
+        'MarkMapper::DocumentNotFound'  => :not_found,
+        'MarkMapper::InvalidKey'        => :unprocessable_entity,
+        'MarkMapper::InvalidScheme'     => :unprocessable_entity,
+        'MarkMapper::NotSupported'      => :unprocessable_entity
+      )
 
     rake_tasks do
+      load "mark_mapper/railtie/application.rake"
       load "mark_mapper/railtie/database.rake"
     end
 

data/lib/mark_mapper/railtie/application.rake

@@ -0,0 +1,12 @@
+namespace :app do
+  desc 'Drops all the entire application configuration for the current Rails.env'
+  task :drop => :environment do
+    MarkMapper.application.drop
+  end
+
+  desc 'Creates the application configuration for the current Rails.env'
+  task :create => :environment do
+    puts "creating application"
+    MarkMapper.application.create
+  end
+end

data/lib/mark_mapper/railtie/database.rake

@@ -1,8 +1,10 @@
 namespace :db do
   unless Rake::Task.task_defined?("db:drop")
-    desc 'Drops all the collections for the database for the current Rails.env'
+    desc 'Drops all the documents for the database for the current Rails.env'
     task :drop => :environment do
-      MarkMapper.database.collections.select {|c| c.name !~ /\Asystem\./ }.each(&:drop)
+      MarkMapper.application.content_databases.each do |db|
+        db.clear
+      end
     end
   end
 
@@ -27,7 +29,8 @@ namespace :db do
 
   unless Rake::Task.task_defined?("db:create")
     task :create => :environment do
-      # noop
+      puts "creating database"
+      MarkMapper.application.create
     end
   end
 
@@ -54,12 +57,6 @@ namespace :db do
       end
     end
   end
-
-  desc 'Load indexes from db/indexes.rb'
-  task :index => :environment do
-    indexes = File.join(Rails.root, 'db', 'indexes.rb')
-    load(indexes) if File.exist?(indexes)
-  end
 end
 
 task 'test:prepare' => 'db:test:prepare'

data/lib/mark_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MarkMapper
-  Version = '0.0.1'
+  Version = '0.0.2'
 end

data/lib/rails/generators/mark_mapper/config/config_generator.rb

@@ -13,6 +13,7 @@ module MarkMapper
 
       def create_config_file
         template 'marklogic.yml', File.join('config', 'marklogic.yml')
+        template 'markmapper.rb', File.join('config', 'initializers/markmapper.rb')
       end
 
       protected

data/lib/rails/generators/mark_mapper/config/templates/marklogic.yml

@@ -1,19 +1,22 @@
 defaults: &defaults
   host: 127.0.0.1
-  port: 27017
+  port: SET YOUR PORT HERE
+  # these are the defaults but you can set them here.
+  # manage_port: 8002
+  # admin_port: 8001
+  # app_services_port: 8000
 
 development:
   <<: *defaults
-  database: <%= database_name || app_name %>_development
+  app_name: <%= database_name || app_name %>_development
 
 test:
   <<: *defaults
-  database: <%= database_name || app_name %>_test
-  w: 0
+  app_name: <%= database_name || app_name %>_test
 
 # set these environment variables on your prod server
 production:
   <<: *defaults
-  database: <%= database_name || app_name %>
+  app_name: <%= database_name || app_name %>
   username: <%%= ENV['MARKLOGIC_USERNAME'] %>
   password: <%%= ENV['MARKLOGIC_PASSWORD'] %>

data/lib/rails/generators/mark_mapper/config/templates/markmapper.rb

@@ -0,0 +1,14 @@
+MarkLogic.application.tap do |app|
+
+  # one way to create a range index. Use this if you want to use MarkMapper's defaults
+  # for your database
+  # app.add_index(MarkLogic::DatabaseSettings::RangeElementIndex.new(:age, :type => 'int'))
+
+  # If you prefer to have finer control over what settings go into a database
+  # you can configure your database(s) like so:
+  app.database('my-content-db') do
+
+    # add range element indexes
+    add_range_element_index(MarkLogic::DatabaseSettings::RangeElementIndex.new(:age, :type => 'int'))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mark_mapper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Paxton Hare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -87,7 +87,6 @@ files:
 - examples/scopes.rb
 - examples/validating/embedded_docs.rb
 - lib/mark_mapper.rb
-- lib/mark_mapper/config.rb
 - lib/mark_mapper/connection.rb
 - lib/mark_mapper/criteria_hash.rb
 - lib/mark_mapper/document.rb
@@ -182,11 +181,13 @@ files:
 - lib/mark_mapper/plugins/validations.rb
 - lib/mark_mapper/query.rb
 - lib/mark_mapper/railtie.rb
+- lib/mark_mapper/railtie/application.rake
 - lib/mark_mapper/railtie/database.rake
 - lib/mark_mapper/translation.rb
 - lib/mark_mapper/version.rb
 - lib/rails/generators/mark_mapper/config/config_generator.rb
 - lib/rails/generators/mark_mapper/config/templates/marklogic.yml
+- lib/rails/generators/mark_mapper/config/templates/markmapper.rb
 - lib/rails/generators/mark_mapper/model/model_generator.rb
 - lib/rails/generators/mark_mapper/model/templates/model.rb
 - spec/config/mark_mapper.yml

data/lib/mark_mapper/config.rb

@@ -1,90 +0,0 @@
-require 'yaml'
-
-module MarkMapper
-
-  # This module defines all the configuration options for MarkMapper, including the
-  # database connections.
-  module Config
-    extend self
-
-    def indexes
-      @indexes ||= []
-    end
-
-    def settings
-      @settings ||= {
-        :host => 'localhost',
-        :port => 8003,
-        :manage_port => 8002,
-        :admin_port => 8001,
-        :app_name => defined?(Rails) ? Rails::Application.subclasses.first.parent.to_s.underscore : nil,
-        :username => nil,
-        :password => nil
-      }
-    end
-
-    def application
-      @application ||=
-        begin
-          MarkLogic::Application.new(app_name,
-            :port => port,
-            :connection => MarkLogic::Connection.new(host, port))
-        end
-      yield(@application) if block_given?
-      @application
-    end
-
-    # Load the settings from a compliant mark_mapper.yml file. This can be used for
-    # easy setup with frameworks other than Rails.
-    #
-    # @example Configure MarkMapper.
-    #  MarkMapper.load!("/path/to/mark_mapper.yml")
-    #
-    # @param [ String ] path The path to the file.
-    # @param [ String, Symbol ] environment The environment to load.
-    #
-    # @since 0.0.1
-    def load!(path, environment = nil)
-      options = load_yaml(path, environment)
-      load_configuration(options) if options.present?
-    end
-
-    # From a hash of options, load all the configuration.
-    #
-    # @example Load the configuration.
-    #  config.load_configuration(options)
-    #
-    # @param [ Hash ] options The configuration options.
-    #
-    # @since 0.0.1
-    def load_configuration(options)
-      options.each_pair do |key, value|
-        if settings.has_key? key.to_sym
-          settings[key.to_sym] = value
-        else
-          raise InvalidConfigurationOption, "Invalid configuration item: #{key}"
-        end
-      end
-    end
-
-    def env_name
-      return Rails.env if defined?(Rails)
-      ENV["RACK_ENV"] || ENV["MARKMAPPER_ENV"] || raise(Errors::NoEnvironment.new)
-    end
-
-    def load_yaml(path, environment = nil)
-      env = environment ? environment.to_s : env_name
-      YAML.load(ERB.new(File.new(path).read).result)[env]
-    end
-
-    def method_missing(name, *args)
-      attr = name.to_s
-      sym = attr.delete("=").to_sym
-      if attr.include?("=")
-        settings[sym] = args.first
-      else
-        settings[sym]
-      end
-    end
-  end
-end