findable 0.0.3 → 0.1.0

data/lib/findable/configuration.rb

@@ -2,7 +2,8 @@ module Findable
   class Configuration
     VALID_OPTIONS = [
       :redis_options,
-      :seed_file
+      :seed_dir,
+      :seed_file,
     ].freeze
 
     attr_accessor *VALID_OPTIONS
@@ -26,6 +27,7 @@ module Findable
 
     def reset
       self.redis_options = nil
+      self.seed_dir = defined?(Rails) ? Rails.root.join("db", "findable_seeds") : nil
       self.seed_file = defined?(Rails) ? Rails.root.join("db", "findable_seeds.rb") : nil
     end
 

data/lib/findable/errors.rb

@@ -1,10 +1,16 @@
 module Findable
   class FindableError < StandardError; end
-  class RecordNotFound < FindableError; end
+
+  class RecordNotFound < FindableError
+    def initialize(model, params)
+      params.symbolize_keys! if params.is_a?(Hash)
+      super("Couldn't find #{model.model_name.name} with #{params.inspect}")
+    end
+  end
 
   class ModelNotFound < FindableError
     def initialize(model_name)
-      super("#{model_name} not found!")
+      super("#{model_name} not found.")
     end
   end
 end

data/lib/findable/query.rb

@@ -0,0 +1,91 @@
+require "findable/query/connection"
+require "findable/query/namespace"
+
+module Findable
+  class Query
+    include Connection
+    include Namespace
+
+    def data
+      redis.hvals(data_key)
+    end
+
+    def ids
+      redis.hkeys(data_key).map(&:to_i)
+    end
+
+    def count
+      redis.hlen(data_key)
+    end
+
+    def find_by_ids(ids)
+      redis.hmget(data_key, *Array(ids))
+    end
+
+    def exists?(id)
+      redis.hexists(data_key, id)
+    end
+
+    def insert(hash)
+      transaction do
+        hash[:id] = auto_incremented_id(hash[:id])
+        redis.hset(data_key, hash[:id], Oj.dump(hash))
+      end
+      hash
+    end
+
+    def import(hashes)
+      transaction do
+        auto_incremented = hashes.each_with_object([]) do |hash, obj|
+          hash["id"] = auto_incremented_id(hash["id"])
+          obj << hash["id"]
+          obj << Oj.dump(hash)
+        end
+        redis.hmset(data_key, *auto_incremented)
+      end
+    end
+
+    def delete(id)
+      redis.hdel data_key, id
+    end
+
+    def delete_all
+      redis.multi do
+        [data_key, info_key].each {|key| redis.del(key) }
+      end
+    end
+
+    def transaction
+      raise ArgumentError, "Require block" unless block_given?
+      if Thread.current[thread_key]
+        yield
+      else
+        begin
+          Thread.current[thread_key] = true
+          Redis::Lock.new(lock_key).lock do
+            yield
+          end
+        rescue Redis::Lock::LockTimeout
+          raise
+        ensure
+          Thread.current[thread_key] = nil
+        end
+      end
+    end
+
+    private
+      def auto_incremented_id(id)
+        if id.present?
+          current = redis.hget(info_key, AUTO_INCREMENT_KEY).to_i
+          id = id.to_i
+          if id > current
+            redis.hset(info_key, AUTO_INCREMENT_KEY, id)
+          end
+          id
+        else
+          redis.hincrby(info_key, AUTO_INCREMENT_KEY, 1)
+        end
+      end
+  end
+end
+

data/lib/findable/query/connection.rb

@@ -0,0 +1,26 @@
+module Findable
+  class Query
+    module Connection
+      # Returns current connection or generate connection.
+      # @return [Redis] Redis connection
+      def redis
+        @_redis ||= generate_redis_connection!
+      end
+
+      private
+        # Generate connection with redis options or default connection.
+        # @return [Redis] Redis connection
+        def generate_redis_connection!
+          redis_options ? Redis.new(*redis_options) : Redis.current
+        end
+
+        # Returns redis options from configuration.
+        # @return [Hash] Redis options
+        # @return [nil] No Redis options
+        def redis_options
+          Findable.config.redis_options.presence
+        end
+    end
+  end
+end
+

data/lib/findable/query/namespace.rb

@@ -0,0 +1,34 @@
+module Findable
+  class Query
+    module Namespace
+      PREFIX = "findable".freeze
+      KEY_NAMES = %i(info data lock index).freeze
+      AUTO_INCREMENT_KEY = :auto_increment
+
+      def initialize(model)
+        @_model = model
+      end
+
+      KEY_NAMES.each do |key|
+        define_method([key, "key"].join("_")) { namespaces[key] }
+      end
+
+      def thread_key
+        [PREFIX, basename].join("_")
+      end
+
+      private
+        def basename
+          @_model.model_name.plural
+        end
+
+        # @return [Hash] namespaces
+        def namespaces
+          @_namespaces ||= KEY_NAMES.each_with_object({}) {|key, obj|
+            obj[key] = [PREFIX, basename, key].join(":")
+          }
+        end
+    end
+  end
+end
+

data/lib/findable/railtie.rb

@@ -2,7 +2,7 @@ module Findable
   class Railtie < ::Rails::Railtie
     initializer "findable" do
       ActiveSupport.on_load(:active_record) do
-        ::ActiveRecord::Base.send(:extend, Findable::Association)
+        require "findable/associations/active_record_ext"
       end
     end
 

data/lib/findable/seed.rb

@@ -1,61 +1,57 @@
 module Findable
   class Seed
-    attr_reader :full_path, :namespaced, :ext
+    class << self
+      def target_files(seed_dir: nil, seed_files: nil)
+        target_dir = pathname(seed_dir) || Findable.config.seed_dir
+        raise ArgumentError unless target_dir
+        Pathname.glob(target_dir.join("**", "*")).map {|full_path|
+          new(full_path, target_dir)
+        }.select {|seed|
+          seed_files.present? ? seed_files.include?(seed.basename) : true
+        }
+      end
 
-    def initialize(path, seed_dir)
-      @_seed_dir = seed_dir
-      self.full_path = path
+      def pathname(path)
+        case path
+        when Pathname then path
+        when String then Pathname.new(path)
+        else nil
+        end
+      end
     end
 
-    def full_path=(path)
-      @full_path = path
-      _path = path.gsub(@_seed_dir, "")
-      @namespaced = /^\// =~ _path ? _path.from(1) : _path
-      @ext = @namespaced[/^.*(?<ext>\.[^\.]+)$/, :ext] || (raise ArgumentError)
+    def initialize(full_path, seed_dir)
+      @_full_path = full_path
+      @_seed_dir = seed_dir
     end
 
-    def base_name
-      @_base ||= @namespaced.sub(@ext, "")
+    def basename
+      @_basename ||= @_full_path.basename(".*").to_s
     end
 
     def model
-      base_name.split("/").reverse.map.with_index {|n,i|
-        i.zero? ? n.singularize : n
-      }.reverse.map(&:camelize).join("::").constantize
-    end
-
-    def load_file
-      case @ext
-      when ".yml"
-        YAML.load_file(@full_path).values
-      else
-        raise UnexpectedFormat
-      end
+      @_model ||= from_seed_dir(without_ext(@_full_path)).to_s.classify.constantize
     end
 
     def bootstrap!
-      model.transaction do
+      model.query.transaction do
         model.delete_all
-        records = load_file.map {|data| model.new(data) }
-        model.import records
+        model.query.import YAML.load_file(@_full_path).values
       end
     end
 
-    class << self
-      def target_files(seed_dir, tables = nil)
-        Dir.glob(patterns(seed_dir)).map {|full_path|
-          Seed.new(full_path, seed_dir)
-        }.select {|seed|
-          tables ? tables.include?(seed.base_name) : true
-        }
+    private
+      def pathname(path)
+        self.class.pathname(path)
       end
 
-      def patterns(seed_dir)
-        %w(yml).map {|format|
-          Rails.root.join("#{seed_dir}/**/*.#{format}").to_s
-        }
+      def without_ext(path)
+        pathname(path).dirname.join(pathname(path).basename(".*"))
+      end
+
+      def from_seed_dir(path)
+        pathname(path).relative_path_from(@_seed_dir)
       end
-    end
   end
 end
 

data/lib/findable/version.rb

@@ -1,4 +1,4 @@
 module Findable
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end
 

data/lib/generators/findable/install_generator.rb

@@ -3,6 +3,11 @@ module Findable
     class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path(File.join(File.dirname(__FILE__), "templates"))
 
+      desc "Create seed_dir of Findable."
+      def create_seed_dir
+        create_file File.join("db", "findable_seeds", ".keep")
+      end
+
       desc "Install Findable files"
       def install_findable_files
         template "seeds.rb", "db/findable_seeds.rb"

data/lib/generators/findable/templates/findable.rb

@@ -2,7 +2,10 @@ Findable.configure do |config|
   # Redis connection setting. (default: `Redis.current`)
   # config.redis_options = {host: "localhost", port: 6379, db: 2}
 
-  # Seed file of Findable
-  # config.seed_file = Rails.root.join("db", "findable_seeds.rb")
+  # Directory of stored seed files.
+  config.seed_dir = Rails.root.join("db", "findable_seeds")
+
+  # Seed file of Findable.
+  config.seed_file = Rails.root.join("db", "findable_seeds.rb")
 end
 

data/lib/generators/findable/templates/seeds.rb

@@ -3,9 +3,6 @@
 # Require seed support module
 require "findable/seed"
 
-# Path to the reading of the seed.
-seed_dir = File.expand_path("../findable_seeds", __FILE__)
-
 # Target seed files.
 # Run all in the case of `nil`.
 # Example of if you want to run some only.
@@ -13,5 +10,5 @@ seed_dir = File.expand_path("../findable_seeds", __FILE__)
 seed_files = nil
 
 # Execute
-Findable::Seed.target_files(seed_dir, seed_files).each {|seed| seed.bootstrap! }
+Findable::Seed.target_files(seed_files: seed_files).each {|seed| seed.bootstrap! }
 

data/spec/spec_helper.rb

@@ -1,19 +1,7 @@
-require "simplecov"
+require "findable"
 require "coveralls"
 Coveralls.wear!
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-
-SimpleCov.start do
-  add_filter "spec"
-  add_filter ".bundle"
-end
-
-require "findable"
-
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|

data/spec/support/initialize_redis.rb

@@ -0,0 +1,2 @@
+Redis.current.flushdb
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: findable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: redis-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,16 +152,17 @@ files:
 - Rakefile
 - findable.gemspec
 - lib/findable.rb
-- lib/findable/association.rb
+- lib/findable/associations.rb
+- lib/findable/associations/active_record_ext.rb
+- lib/findable/associations/utils.rb
 - lib/findable/base.rb
 - lib/findable/configuration.rb
-- lib/findable/connection.rb
 - lib/findable/errors.rb
-- lib/findable/namespace.rb
+- lib/findable/query.rb
+- lib/findable/query/connection.rb
+- lib/findable/query/namespace.rb
 - lib/findable/railtie.rb
-- lib/findable/recordable.rb
 - lib/findable/seed.rb
-- lib/findable/serializer.rb
 - lib/findable/version.rb
 - lib/generators/findable/install_generator.rb
 - lib/generators/findable/templates/findable.rb
@@ -172,6 +173,7 @@ files:
 - spec/findable/configuration_spec.rb
 - spec/spec_helper.rb
 - spec/support/.keep
+- spec/support/initialize_redis.rb
 homepage: https://github.com/i2bskn/findable
 licenses:
 - MIT
@@ -192,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Redis wrapper with API like ActiveRecord.
@@ -202,3 +204,4 @@ test_files:
 - spec/findable/configuration_spec.rb
 - spec/spec_helper.rb
 - spec/support/.keep
+- spec/support/initialize_redis.rb