tramway-core 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b78371455853d155814ff2b43ee628d01ae92508a2607fa8cd1a3a02c8802e
-  data.tar.gz: 913a54cba50d0767d037b343cb1c36dbf8a8aa071e41a8879525ce854196148f
+  metadata.gz: 301196e34c11beb97c8e516d2094d0f98af73cb4c8b9e250804730c5d9479c30
+  data.tar.gz: 03c176c1a8d6e14502af6fb509a28bd7b98a56124551c5ce0cd6d3144ff83bd3
 SHA512:
-  metadata.gz: faceb82d0bb5111852bed97404119e1722a75b98d9bbaec318c39da7744c034b9ca5205bc02dff80128450ec5c5f6d798970cd6cabfd497dcef2d11092ad3308
-  data.tar.gz: 96c67ce7e2216b1f17d736a242acef8b80378246d3e89c40e9b78b2e57ae4ee820665138bb2a46d61779de65aefb17f7d163f27df9d3cc95e253a03b206e5631
+  metadata.gz: 942eae863fdab061a8d9800aae4d89703bc754b58dad72e1b6a2cd4c104de44f0f65e5001e069cab8e406d5b92303fadde3231e70d0596b941923c66f7af1cd5
+  data.tar.gz: f258d270d6baba789f5fbbc0412767c8f0a4ce9ae3bbb6c1f5633628324a9e028dc105ac1c10571efd4a99b637faa53e94674a8838e67b21f6781a0f2cb2f396

data/Rakefile

@@ -1,36 +1,8 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+require 'rake'
+require 'rspec/core/rake_task'
+ 
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = '--format documentation'
 end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Tramway::Core'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
-load 'rails/tasks/statistics.rake'
-
-
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test
+task default: :spec

data/app/decorators/tramway/core/application_decorator.rb

@@ -1,7 +1,9 @@
+require 'tramway/error'
+
 class Tramway::Core::ApplicationDecorator
   include ActionView::Helpers
   include ActionView::Context
-  include FontAwesome::Rails::IconHelper
+  include ::FontAwesome::Rails::IconHelper
 
   def initialize(object)
     @object = object
@@ -11,6 +13,11 @@ class Tramway::Core::ApplicationDecorator
     object.try(:name) || object.try(:title) || title
   end
 
+  def title
+    error = Tramway::Error.new(plugin: :core, method: :title, message: ("Please, implement `title` method in a #{self.class} or #{object.class}"))
+    raise error.message
+  end
+
   class << self
     def list_attributes
       []
@@ -33,9 +40,9 @@ class Tramway::Core::ApplicationDecorator
 
       define_method association_name do
         class_name = object.class.reflect_on_association(association_name).options[:class_name]
-        #FIXME use error abstraction
         unless class_name
-          raise "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: 'ModelName'`"
+          error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: ("Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`"))
+          raise error.message
         end
 
         object.send(association_name).active.map do |association_object|
@@ -51,7 +58,15 @@ class Tramway::Core::ApplicationDecorator
   delegate :human_state_name, to: :object
 
   def link
-    object.file.url
+    if object.try :file
+      object.file.url
+    else
+      error = Tramway::Error.new(
+        plugin: :core,
+        method: :link,
+        message: ("Method `link` uses `file` attribute of the decorated object. If decorated object doesn't contain `file`, you shouldn't use `link` method."))
+      raise error.message
+    end
   end
 
   def model

data/app/forms/tramway/core/application_form.rb

@@ -4,6 +4,7 @@ module Tramway::Core
       super(object).tap do
         @@model_class = object.class
         @@enumerized_attributes = object.class.enumerized_attributes
+        @@associations ||= []
 
         self.class.full_class_name_associations.each do |association, class_name|
           if class_name.is_a? Array
@@ -21,8 +22,12 @@ module Tramway::Core
     end
 
     def submit(params)
-      raise 'ApplicationForm::Params should not be nil'.inspect unless params
-      save if validate params
+      if params
+        save if validate params
+      else
+        error = Tramway::Error.new(plugin: :core, method: :title, message: ('ApplicationForm::Params should not be nil'))
+        raise error.message
+      end
     end
 
     def form_properties(**args)
@@ -33,6 +38,8 @@ module Tramway::Core
       @form_properties || []
     end
 
+    def build_errors; end
+
     class << self
       delegate :defined_enums, to: :model_class
 
@@ -53,12 +60,13 @@ module Tramway::Core
           options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
             a.name == association.to_sym
           end.first&.options
-          
+
           if options
             if options[:polymorphic]
               hash.merge! association => @@model_class.send("#{association}_type").values
             else
-              hash.merge!(association => options[:class_name].constantize)
+              class_name = options[:class_name] || association.to_s.camelize
+              hash.merge!(association => class_name.constantize)
             end
           end
           hash
@@ -78,7 +86,17 @@ module Tramway::Core
       end
 
       def model_class
-        @@model_class ||= self.name.to_s.sub(/Form$/, '')
+        if @@model_class
+          @@model_class
+        else
+          model_class_name ||= self.name.to_s.sub(/Form$/, '')
+          begin
+            @@model_class = model_class_name.constantize
+          rescue
+            error = Tramway::Error.new(plugin: :core, method: :model_class, message: ("There is not model class name for #{self.name}. Should be #{model_class_name} or you can use another class to initialize form object."))
+            raise error.message
+          end
+        end
       end
     end
   end

data/app/models/tramway/core/application_record.rb

@@ -1,4 +1,6 @@
-require 'carrierwave/orm/activerecord'
+if defined?(CarrierWave::Mount)
+  require 'carrierwave/orm/activerecord'
+end
 
 module Tramway
   module Core

data/app/uploaders/application_uploader.rb

@@ -1,3 +1,5 @@
+require 'carrierwave'
+
 class ApplicationUploader < CarrierWave::Uploader::Base
   storage :file
 

data/config/initializers/carrierwave.rb

@@ -0,0 +1,3 @@
+ActiveSupport.on_load :active_record do
+  require 'audited'
+end

data/lib/tramway/core.rb

@@ -1,7 +1,8 @@
-require "tramway/core/engine"
-require "tramway/collection"
-require "tramway/collections/helper"
-#require 'string'
+require 'tramway/core/engine'
+require 'tramway/collection'
+require 'tramway/collections/helper'
+require 'font-awesome-rails'
+require 'reform'
 
 module Tramway
   module Core

data/lib/tramway/core/engine.rb

@@ -1,6 +1,7 @@
 require 'tramway/core/generators/install_generator'
 require 'tramway/core/application'
 require 'simple_form'
+require 'enumerize'
 
 module Tramway
   module Core

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.8.1'
+    VERSION = '1.8.2'
   end
 end

data/lib/tramway/error.rb

@@ -1,9 +1,10 @@
 class Tramway::Error < Exception
-  def initialize(plugin: nil, method: nil, message: nil)
+  def initialize(*args, plugin: nil, method: nil, message: nil)
     @properties ||= {}
     @properties[:plugin] = plugin
     @properties[:method] = method
     @properties[:message] = message
+    super(*args)
   end
 
   def message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails
@@ -88,42 +88,30 @@ dependencies:
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: audited
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +192,118 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: font-awesome-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Core for all Tramway Rails Engines
 email:
 - kalashnikovisme@gmail.com
@@ -238,6 +338,7 @@ files:
 - app/views/tramway/core/shared/_input_extended.html.haml
 - app/views/tramway/core/shared/_messages.html.haml
 - config/initializers/assets.rb
+- config/initializers/carrierwave.rb
 - config/initializers/plurals.rb
 - config/locales/ru/dates.yml
 - config/locales/ru/helpers.yml