excursion 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3dfd7605be2886786008e1c04475bf20279c51d
-  data.tar.gz: 5ff9b50daa9541d28268394c45dd3293d6e176f0
+  metadata.gz: 970c66c03bce9f7cc650641b90518f7b81d0c716
+  data.tar.gz: d63f0475015ad67d34e5ef75a84d12f1f723cc81
 SHA512:
-  metadata.gz: 4b61c03942b8842cfe658091e496586977d9d2e8c6c2c7e8be428a90d684da786272983b0d780936172d8ad06f5bd8d9c1352b45313fc5750f7c4797184f6522
-  data.tar.gz: e2945a3964b874db4877b02c4b66c9b7ab5d1134d6230568016f323e04f6b5e0d6ff3b82e426224aa6010b5f962ec6e0071d58cad46fb63076dc173e33d4d3fc
+  metadata.gz: 4922ab494d86409741c2229dc85a5cfd5ffa5696bfdb44545c08f74c646608ab40e9ba35b012c3329fd8c7d7c178cabd5253819ab34c48d50c81217fa32f11dd
+  data.tar.gz: e219ee026b5d0d6615869a72efb30a18a911c5de42e6a214fa42c1a630f17e1926858b1566e953b6bc339754b05939d9208912cb1fc2654f33007f9fda8add16

data/lib/excursion/datastores/active_record.rb

@@ -0,0 +1,47 @@
+require 'excursion/datastores/datastore'
+require 'excursion/exceptions/active_record'
+
+module Excursion
+  module Datastores
+    class ActiveRecord < Datastore
+      
+      def model_find(key)
+        return @model.find_by(key: key) if Excursion.rails4?
+        return @model.find_by_key(key) if Excursion.rails3?
+      end
+
+      def read(key)
+        model_find(key).value
+      rescue
+        nil
+      end
+      alias_method :get, :read
+      
+      def write(key, value)
+        written = model_find(key)
+        if written.nil?
+          written = @model.create key: key, value: value
+        else
+          written.update value: value
+        end
+        written.value
+      end
+      alias_method :set, :write
+      
+      def delete(key)
+        deleted = model_find(key)
+        return nil if deleted.nil?
+        deleted.destroy
+        deleted.value
+      end
+      alias_method :unset, :delete
+
+      protected
+
+      def initialize
+        @model = Excursion::RoutePool
+      end
+    
+    end
+  end
+end

data/lib/excursion/datastores/active_record_with_memcache.rb

@@ -0,0 +1,40 @@
+require 'excursion/datastores/active_record'
+require 'excursion/datastores/memcache'
+
+module Excursion
+  module Datastores
+    class ActiveRecordWithMemcache < Datastore
+      
+      def read(key)
+        value = @cache.read(key)
+        return value unless value.nil?
+        
+        value = @model.read(key)
+        @cache.write(key, value) unless value.nil?
+
+        value
+      end
+      alias_method :get, :read
+      
+      def write(key, value)
+        @model.write(key, value)
+        @cache.write(key, value)
+      end
+      alias_method :set, :write
+      
+      def delete(key)
+        @model.delete(key)
+        @cache.delete(key)
+      end
+      alias_method :unset, :delete
+
+      protected
+
+      def initialize(server)
+        @model = Excursion::Datastores::ActiveRecord.new
+        @cache = Excursion::Datastores::Memcache.new(server)
+      end
+    
+    end
+  end
+end

data/lib/excursion/datastores/file.rb

@@ -36,11 +36,11 @@ module Excursion
       end
 
       def exists?
-        ::File.exists(@path)
+        ::File.exists?(@path)
       end
 
       def read_file
-        YAML.load_file(@path) || {}
+        exists? ? YAML.load_file(@path) : {}
       rescue
         {}
       end
@@ -48,7 +48,7 @@ module Excursion
       def write_file(results)
         FileUtils.mkpath(::File.dirname(@path))
         ::File.open(@path, 'w') { |f| f.write(results.to_yaml)}
-      rescue
+      rescue StandardError => e
         raise DatastoreConfigurationError, "Could not write to the excursion route pool file: #{@path}"
       end
     end

data/lib/excursion/exceptions/active_record.rb

@@ -0,0 +1,4 @@
+module Excursion
+  class ActiveRecordError < Error; end
+  class TableDoesNotExist < ActiveRecordError; end
+end

data/lib/excursion/helpers/url_helper.rb

@@ -9,9 +9,14 @@ module Excursion
 
       def method_missing(meth, *args)
         if meth.to_s.match(/\A(#{routes.collect { |name,route| name }.join("|")})_(url|path)\Z/)
-          ActionDispatch::Routing::RouteSet::NamedRouteCollection::UrlHelper.create(routes.get($1.to_sym), @application.default_url_options).call(Rails.application.routes, args)
-          # Playing with getting Rails3 working
-          #ActionDispatch::Http::URL.url_for(@application.default_url_options.merge({path: replaced_path(routes.get($1.to_sym), args) }))
+          if Excursion.rails4?
+            ActionDispatch::Routing::RouteSet::NamedRouteCollection::UrlHelper.create(routes.get($1.to_sym), @application.default_url_options).call(Rails.application.routes, args)
+          elsif Excursion.rails3?
+            # Playing with getting Rails3 working
+            #mapping = ActionDispatch::Routing::Mapper::Mapping.new(routes, {}, routes.get($1.to_sym).path.spec.to_s.dup, {:controller => 'dummy', :action => 'dummy'})
+            #puts mapping.send(:instance_variable_get, :@path)
+            ActionDispatch::Http::URL.url_for(@application.default_url_options.merge({path: replaced_path(routes.get($1.to_sym), args)}))
+          end
         else
           super
         end
@@ -24,13 +29,16 @@ module Excursion
       end
 
       # Playing with getting Rails3 working
-      #def replaced_path(route, args)
-      #  path = route.path.spec.to_s.dup
-      #  route.required_parts.zip(args) do |part, arg|
-      #    path.gsub!(/(\*|:)#{part}/, Journey::Router::Utils.escape_fragment(arg.to_param))
-      #  end
-      #  path
-      #end
+      def replaced_path(route, args)
+        path = route.path.spec.to_s.dup # ActionDispatch::Routing::Mapper.normalize_path(route.path.spec.to_s.dup)
+
+        route.required_parts.zip(args) do |part, arg|
+          path.gsub!(/(\*|:)#{part}/, Journey::Router::Utils.escape_fragment(arg.to_param))
+        end
+
+        path.gsub!(/\(\.:format\)/, '') # This is really gross, and :format should actually be supported
+        path
+      end
     end
   end
 end

data/lib/excursion/pool.rb

@@ -42,6 +42,13 @@ module Excursion
       when :memcache
         raise MemcacheConfigurationError, "You must configure the :memcache datastore with a memcache_server" if Excursion.configuration.memcache_server.nil?
         @@datastore ||= Excursion::Datastores::Memcache.new(Excursion.configuration.memcache_server)
+      when :active_record
+        raise TableDoesNotExist, "To use the :active_record datastore you must first run `rails generate excursion:active_record` followed by `rake db:migrate` to create the storage table" unless Excursion::RoutePool.table_exists?
+        @@datastore ||= Excursion::Datastores::ActiveRecord.new
+      when :active_record_with_memcache
+        raise MemcacheConfigurationError, "You must configure the :active_record_with_memcache datastore with a memcache_server" if Excursion.configuration.memcache_server.nil?
+        raise TableDoesNotExist, "To use the :active_record_with_memcache datastore you must first run `rails generate excursion:active_record` followed by `rake db:migrate` to create the storage table" unless Excursion::RoutePool.table_exists?
+        @@datastore ||= Excursion::Datastores::ActiveRecord.new(Excursion.configuration.memcache_server)
       end
     end
   end

data/lib/excursion/railtie.rb

@@ -1,7 +1,7 @@
 module Excursion
   class Railtie < Rails::Railtie
     config.after_initialize do |app|
-      unless Excursion.configuration.register_app == false
+      if Excursion.configuration.register_app == true && !Excursion.configuration.datastore.nil? && !defined?(Rails::Generators::Base) # HACK is there a better way to attempt to check if we're running a generator?
         app.reload_routes!
         Excursion::Pool.register_application(app)
       end

data/lib/excursion/route_pool.rb

@@ -0,0 +1,5 @@
+class Excursion::RoutePool < ActiveRecord::Base
+  self.table_name = 'excursion_route_pool'
+  serialize :value
+  attr_accessible :key, :value if Excursion.rails3?
+end

data/lib/excursion/version.rb

@@ -1,3 +1,3 @@
 module Excursion
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/excursion.rb

@@ -21,6 +21,7 @@ module Excursion
   end
 end
 
+require 'excursion/route_pool'
 require 'excursion/pool'
 require 'excursion/helpers'
 require 'excursion/railtie'

data/lib/generators/excursion/active_record_generator.rb

@@ -0,0 +1,19 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/active_record'
+
+module Excursion
+  class ActiveRecordGenerator < ::Rails::Generators::Base
+    include ::Rails::Generators::Migration
+    
+    self.source_paths << File.join(File.dirname(__FILE__), 'templates')
+
+    def create_migration_file
+      migration_template 'migration.rb', 'db/migrate/create_excursion_route_pool.rb'
+    end
+
+    def self.next_migration_number(dirname)
+      ::ActiveRecord::Generators::Base.next_migration_number dirname
+    end
+  end
+end

data/lib/generators/excursion/templates/migration.rb

@@ -0,0 +1,14 @@
+class CreateExcursionRoutePool < ActiveRecord::Migration
+  def self.up
+    create_table :excursion_route_pool, :force => true do |table|
+      table.string :key, :null => false
+      table.text   :value, :null => false
+    end
+
+    add_index :excursion_route_pool, :key, :name => 'excursion_route_pool_key', :unique => true
+  end
+
+  def self.down
+    drop_table :excursion_route_pool
+  end
+end

data/spec/dummy/config/environments/development.rb

@@ -5,9 +5,7 @@ Dummy::Application.configure do
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/environments/test.rb

@@ -6,14 +6,12 @@ Dummy::Application.configure do
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
+  config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/spec/dummy/db/migrate/20130618222840_create_excursion_route_pool.rb

@@ -0,0 +1,14 @@
+class CreateExcursionRoutePool < ActiveRecord::Migration
+  def self.up
+    create_table :excursion_route_pool, :force => true do |table|
+      table.string :key, :null => false
+      table.text   :value, :null => false
+    end
+
+    add_index :excursion_route_pool, :key, :name => 'excursion_route_pool_key', :unique => true
+  end
+
+  def self.down
+    drop_table :excursion_route_pool
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20130618222840) do
+
+  create_table "excursion_route_pool", force: true do |t|
+    t.string "key",   null: false
+    t.text   "value", null: false
+  end
+
+  add_index "excursion_route_pool", ["key"], name: "excursion_route_pool_key", unique: true
+
+end