fish0 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b9ab2cb9d1ba9a260041b1c56e0fa42225aca8
-  data.tar.gz: be489b5a7a623cbaeb0c91a758da070ac60c1e9a
+  metadata.gz: c4ea27a40ff37fcc325b73bb219e76a5e23aeadb
+  data.tar.gz: 8492357144680757b2f7a31a5ff5d3417eb49785
 SHA512:
-  metadata.gz: 002ed4cd27ee9cde21cef90914d32d79b3377868a88558923bbec097ae9eb65a295ca5b50a9e84c4182403075d18e90df9d1e5b6d6fb3655419b41ae4b31410b
-  data.tar.gz: cae77ee8d41315b8b003275a1e5337a4434c4a3092de51e066a9fdae2b5cdd35d54da3028edc562281abff242484536fbd4c82972c1f4d603721a01a44393271
+  metadata.gz: eaacc7b77a8d7b5744129b884aeef8278c3912f5b0f21d213986314240bf700ed36fbe18c3b76b46a961a22ec0815c8acedd55820847cb39dbc175396a7481a0
+  data.tar.gz: 5e5a584979c2488dfbabeb21130e52692363d1d6f46d957839e088d461b6fd52b10bafa0ccb36492d4c3eacaebaa611b59e867a32d4fadbc4a669155cc02c435

data/README.md

@@ -35,6 +35,7 @@ production:
 Inherit your model class from `Fish0::Model` and feel the power of the Fish!
 
 With `attribute` define your attributes and with `primary_key` set your main primary key, e.g. `id`, `slug`, etc.
+
 ```ruby
 # app/models/article.rb
 class Article < Fish0::Model
@@ -94,7 +95,7 @@ class ArticlesController < ApplicationController
   # ...
 
   def show
-    @article = ArticleRepository.new.where(slug: params[:slug]).first!
+    @article = Article.where(slug: params[:slug]).published.first!
   end
 
   # ...
@@ -109,7 +110,7 @@ class ArticlesController < ApplicationController
   include Fish0::Concerns::Paginatable
 
   def index
-    @articles = paginate(ArticleRepository.new.published)
+    @articles = paginate(Article.published)
   end
 
   # ...
@@ -153,7 +154,7 @@ Your model should respond to `:updated_at` with DateTime object.
 # app/models/article.rb
 class Article
   # ...
-  include Fish0::Concerns::Cacheable
+  cacheable
 
   # ...
 end
@@ -163,7 +164,7 @@ class ArticlesController < ApplicationController
   # ...
 
   def show
-    @article = ArticleRepository.new.where(slug: params[:slug]).first!
+    @article = Article.where(slug: params[:slug]).first!
     if stale?(@article)
       respond_to do |format|
         format.html

data/lib/fish0/concerns/base.rb

@@ -3,7 +3,13 @@ module Fish0
     module Base
       extend ActiveSupport::Concern
 
-      cattr_accessor :primary_key, instance_writer: false
+      def primary_key
+        self.class.primary_key
+      end
+
+      def primary_key_value
+        send(primary_key)
+      end
 
       included do
         class << self
@@ -13,25 +19,23 @@ module Fish0
             @primary_key
           end
 
-          delegate :all, to: :repository
-          delegate :where, to: :repository
-          delegate :first, to: :repository
-          delegate :last, to: :repository
-          delegate :search, to: :repository
-          delegate :order_by, to: :repository
-          delegate :limit, to: :repository
-          delegate :skip, to: :repository
-          delegate :projection, to: :repository
+          def cacheable
+            include Concerns::Cacheable
+          end
 
-          def first!
-            first || raise(RecordNotFound, "can't find in #{collection} with #{conditions}")
+          def method_missing(method_name, *arguments, &block)
+            if repository.respond_to?(method_name)
+              repository.send(method_name, *arguments, &block)
+            else
+              super
+            end
           end
 
-          def last!
-            last || raise(RecordNotFound, "can't find in #{collection} with #{conditions}")
+          def respond_to_missing?(method_name, include_private = false)
+            repository.respond_to?(method_name) || super
           end
 
-          private
+          protected
 
           def default_primary_key
             :slug
@@ -46,6 +50,9 @@ module Fish0
           end
 
           def repository
+            if "#{entity.to_s}Repository".safe_constantize
+              return "#{entity.to_s}Repository".constantize.new(collection, entity)
+            end
             Fish0::Repository.new(collection, entity)
           end
         end

data/lib/fish0/concerns/cacheable.rb

@@ -18,10 +18,6 @@ module Fish0
 
         private
 
-        def primary_key_value
-          send(primary_key)
-        end
-
         def timestamp_attributes_for_update
           [:updated_at]
         end

data/lib/fish0/repository.rb

@@ -38,11 +38,19 @@ module Fish0
       to_entity.call(element) if element
     end
 
+    def first!
+      first || raise(RecordNotFound, "can't find in #{collection} with #{conditions}")
+    end
+
     def last
       element = all.last
       to_entity.call(element) if element
     end
 
+    def last!
+      last || raise(RecordNotFound, "can't find in #{collection} with #{conditions}")
+    end
+
     def where(query)
       conditions.merge!(query)
       self

data/lib/fish0/version.rb

@@ -1,3 +1,3 @@
 module Fish0
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fish0
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dmitry Zuev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails