fish0 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4926b44649bbd6260c6bc5f7b3f604572b33cc51
-  data.tar.gz: f0eaac6f49a35e74c187747bf7d21a2b685cec16
+  metadata.gz: 2021b835ea29a55abd9c8bf3273c7057ca203b31
+  data.tar.gz: 7d6b3ac4b3189da0c45c7bb4ebd420f28a7bd596
 SHA512:
-  metadata.gz: 75279dfe625e4322fda1665f89ff1c29028a114b5be9d426030f995ccf2690177352c4bb660916d69447bf1445f901c0d2d82296c7b00508540b3fe993cc9d0a
-  data.tar.gz: aa15b12ac7c969746a974b0ca70c2cb642173928bdec95209fe45fce684916060a80f5f4abd69868ed9f2ef897d5b3be5bfa0dd3584c3e1a9d8a70b2019b0845
+  metadata.gz: c38e62e79f5eb07febb7ccc57cbc672a24e638f8bd2f5dd66c37232d64758fb56a8929bbc7d94235e9cba35f3fa2a4c16b91e4f77ccb9c320fe20394c2dd0626
+  data.tar.gz: c90292b121a45778a1210937f2b78af4b1bf4bf16aecd5359a9ac1ad7ed59751651b7f1c55707511bb7ffd261cb820111b61d4d2edad34e8c9dc021e46787420

data/README.md

@@ -1,5 +1,9 @@
 # Fish0
 
+[![Build Status](https://api.travis-ci.org/rambler-digital-solutions/fish0.svg)](https://travis-ci.org/rambler-digital-solutions/fish0)
+[![Code Climate](https://codeclimate.com/github/rambler-digital-solutions/fish0/badges/gpa.svg)](https://codeclimate.com/github/rambler-digital-solutions/fish0)
+[![Gem Version](https://badge.fury.io/rb/fish0.svg)](https://badge.fury.io/rb/fish0)
+
 > The fish doesn't think because the fish knows everything.
 
 Fish0 is the plugin for read-only content websites with MongoDB storage. Works perfect with Rambler&Co CQRS architecture.

data/Rakefile

@@ -19,4 +19,4 @@ require 'rspec/core/rake_task'
 desc 'Run all specs in spec directory (excluding plugin specs)'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/fish0/concerns/cacheable.rb

@@ -5,11 +5,10 @@ module Fish0
 
       included do
         def cache_key(*timestamp_names)
-          case
-          when timestamp_names.any?
+          if timestamp_names.any?
             timestamp = max_updated_column_timestamp(timestamp_names)
             "#{self.class.to_s.tableize}/#{primary_key_value}-#{timestamp.utc.to_s(:nsec)}"
-          when timestamp = max_updated_column_timestamp
+          elsif timestamp = max_updated_column_timestamp
             "#{self.class.to_s.tableize}/#{primary_key_value}-#{timestamp.utc.to_s(:nsec)}"
           else
             "#{self.class.to_s.tableize}/#{primary_key_value}"

data/lib/fish0/concerns/equalable.rb

@@ -0,0 +1,10 @@
+module Fish0
+  module Concerns
+    module Equalable
+      def ==(other)
+        other.class == self.class && other.attributes == attributes
+      end
+      alias eql? ==
+    end
+  end
+end

data/lib/fish0/concerns/paginatable.rb

@@ -13,7 +13,7 @@ module Fish0
         end
 
         def paginate(collection)
-          Fish0::Paginator.new(collection, page_number: page, per_page: per_page).all
+          Fish0::Paginator.new(collection, page_number: page, per_page: per_page).to_collection
         end
 
         def per_page

data/lib/fish0/model.rb

@@ -3,5 +3,6 @@ module Fish0
     extend ActiveModel::Naming
     include Fish0::Concerns::Base
     include Fish0::Concerns::ViewModel
+    include Fish0::Concerns::Equalable
   end
 end

data/lib/fish0/paginator.rb

@@ -1,12 +1,14 @@
 module Fish0
   class Paginator
     include Enumerable
-    delegate :each, :all, :skip, :limit, :padding, :fetch, to: :collection
+    delegate :each, :to_collection, :skip, :limit, :padding, :fetch, to: :collection
 
     attr_reader :collection
 
     def initialize(collection, page_number: 1, per_page: 22, padding: 0)
-      @collection = collection || (raise ArgumentError)
+      raise ArgumentError,
+            'you can paginate only Fish0::Repository' unless collection.is_a?(Fish0::Repository)
+      @collection = collection
       @per = per_page
       @page = page_number
       @padding = padding

data/lib/fish0/repository.rb

@@ -11,7 +11,7 @@ module Fish0
     include Enumerable
 
     delegate :aggregate, to: :source
-    delegate :each, to: :all
+    delegate :each, to: :to_collection
 
     def initialize(collection, entity_class = nil)
       raise ArgumentError, 'you should provide collection name' unless collection
@@ -24,12 +24,24 @@ module Fish0
       @entity_class = entity_class || String(collection).singularize.camelize.constantize
     end
 
+    def find_one(query)
+      where(query).first
+    end
+
+    def find_one!(query)
+      find_one(query) || raise(RecordNotFound, "can't find in #{collection} with #{conditions}")
+    end
+
+    def to_collection
+      Fish0::Collection.new(fetch.map(&to_entity))
+    end
+
     def find(filter = nil, options = {})
       @source.find filter.dup, options
     end
 
     def all
-      Fish0::Collection.new(fetch.map(&to_entity))
+      self
     end
 
     def projection(values)
@@ -78,8 +90,8 @@ module Fish0
     def fetch
       scoped = find(conditions, sort: order)
       scoped = scoped.projection(@projection) if @projection
-      scoped = scoped.skip(skip_quantity) if skip_quantity > 0
-      scoped = scoped.limit(limit_quantity) if limit_quantity > 0
+      scoped = scoped.skip(skip_quantity) if skip_quantity.positive?
+      scoped = scoped.limit(limit_quantity) if limit_quantity.positive?
       scoped
     end
 

data/lib/fish0/version.rb

@@ -1,3 +1,3 @@
 module Fish0
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.0.15'.freeze
 end

data/lib/fish0.rb

@@ -7,6 +7,7 @@ require 'fish0/exceptions'
 require 'fish0/repository'
 require 'fish0/paginator'
 require 'fish0/concerns/cacheable'
+require 'fish0/concerns/equalable'
 require 'fish0/concerns/paginatable'
 require 'fish0/concerns/view_model'
 require 'fish0/concerns/base'

data/spec/base_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+RSpec.describe 'Fish0::Base' do
+  let!(:headline) { FFaker::Lorem.sentence }
+  let!(:article) { create(:article, headline: headline) }
+  let!(:other_article) { create(:article) }
+
+  describe '.find_one' do
+    subject { Article.find_one(query) }
+
+    context 'when article with such headline exists in the database' do
+      let(:query) { { headline: headline } }
+      it { is_expected.to eq(article) }
+    end
+
+    context 'when there is no such article in database' do
+      let(:query) { { headline: 'кирриллица' } }
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '.find_one!' do
+    subject { Article.find_one!(query) }
+
+    context 'when article with such headline exists in the database' do
+      let(:query) { { headline: headline } }
+      it { is_expected.to eq(article) }
+    end
+
+    context 'when there is no such article in database' do
+      let(:query) { { headline: 'кирриллица' } }
+      it 'raises exception' do
+        expect { subject }.to raise_error(Fish0::RecordNotFound)
+      end
+    end
+  end
+end

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

@@ -19,20 +19,6 @@ Rails.application.configure do
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end

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

@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/factories/article.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :article, class: Article do
+    slug { FFaker::Internet.slug }
+    headline { FFaker::Lorem.sentence }
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'rspec/rails'
 # require 'rspec/autorun'
 require 'factory_girl_rails'
+require 'ffaker'
 
 Rails.backtrace_cleaner.remove_silencers!
 

data/spec/support/factory_girl.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

data/spec/support/mongo_cleaner.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.after(:each) do
+    Fish0.mongo_reader.database.drop
+  end
+end

data/spec/support/update_behaviour.rb

@@ -0,0 +1,7 @@
+module UpdateBehavior
+  def save!
+    self.class.source.insert_one(attributes)
+  end
+end
+
+Fish0::Model.include(UpdateBehavior)

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: fish0
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Dmitry Zuev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -70,72 +70,86 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.35'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: |-
   Plugin for read-only content websites with MongoDB storage.
                      Works perfect with Rambler&Co CQRS projects
@@ -152,6 +166,7 @@ files:
 - lib/fish0/collection.rb
 - lib/fish0/concerns/base.rb
 - lib/fish0/concerns/cacheable.rb
+- lib/fish0/concerns/equalable.rb
 - lib/fish0/concerns/paginatable.rb
 - lib/fish0/concerns/view_model.rb
 - lib/fish0/configuration.rb
@@ -161,6 +176,7 @@ files:
 - lib/fish0/paginator.rb
 - lib/fish0/repository.rb
 - lib/fish0/version.rb
+- spec/base_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -181,7 +197,6 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -194,13 +209,16 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/factories/article.rb
 - spec/models/model_spec.rb
 - spec/spec_helper.rb
+- spec/support/factory_girl.rb
+- spec/support/mongo_cleaner.rb
+- spec/support/update_behaviour.rb
 homepage: https://github.com/rambler-digital-solutions/fish0
 licenses:
 - MIT
@@ -228,6 +246,7 @@ signing_key:
 specification_version: 4
 summary: Plugin for read-only content websites
 test_files:
+- spec/base_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -245,7 +264,6 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -259,13 +277,16 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/factories/article.rb
 - spec/models/model_spec.rb
 - spec/spec_helper.rb
+- spec/support/factory_girl.rb
+- spec/support/mongo_cleaner.rb
+- spec/support/update_behaviour.rb
 has_rdoc: 

data/spec/dummy/config/initializers/assets.rb

@@ -1,11 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )