redmine_crm 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d898d5a3d9ff5af93efe10532d38293df8a21e22
-  data.tar.gz: 4f52bf19ea39abe32b0cfed726f4218cf8096b7d
+  metadata.gz: d3056eb68011716cb6d4ef47f1ccbd2cf8c6ef4a
+  data.tar.gz: c0381b69f22b09564830680e6c4dc6a75e79c24e
 SHA512:
-  metadata.gz: 99ede1123b31e8ee8c752f2e95e3c9f7fd1ffb2ba78f78ac7c99b68b05ca9d731f742ca8fb1c93ff5fc3a1af35ef070c41986179be44f4d135c1706de8f4f985
-  data.tar.gz: 901a381a3f17bd5849c8fcc80374e7e72c24aaf6b1b3f4283d4385c83d8e29f3283ec45672b8914b2c3bda1d62df590fc35c4afd6fbfe107d95c7c110ddd9fc9
+  metadata.gz: 6bf85404ae5d1af1f2a1d98c24190d9218a4a04f75b77ceee6161c2a8e66e8cb99d3d1b206880435035393ad955edb6e97c9699ce2bb96934256f92bc718169c
+  data.tar.gz: 6c76ef2ab80c866843bc84e3b5444fa4b0b38c73eb193cf1e613fec5f7968af8bf83fd86f9c8c5dc45932477dcda4a0c033f2b62a4859509d7a626fbebda8d30

data/README.md

@@ -1,7 +1,9 @@
 # RedmineCrm
 
 Gem include next functional for Redmine plugins:
-  rcrm_acts_as_taggable
+  * rcrm_acts_as_taggable
+  * rcrm_acts_as_votable
+  * rcrm_acts_as_viewable
 
 ## Installation
 
@@ -20,14 +22,14 @@ Or install it yourself as:
     $ gem install redmine_crm
 
 Create migration with next code:
-```ruby  
+```ruby
   require 'redmine_crm/rcrm_acts_as_taggable'
 
   def self.up
     ActiveRecord::Base.create_taggable_table
   end
 
-  def self.down    
+  def self.down
     ActiveRecord::Base.drop_taggable_table
   end
 end
@@ -47,12 +49,6 @@ Add to model
   rcrm_acts_as_votable
 ```
 
-For use css and js from gem you may use code like this:
-
-<% content_for :header_tags do %>
-  <%= javascript_include_tag "redmine_crm"  %>
-  <%= stylesheet_link_tag "redmine_crm" %>
-<% end %>
 
 ## Run test
 

data/doc/CHANGELOG

@@ -4,6 +4,10 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2015 RedmineCRM
 http://www.redminecrm.com/
 
+== 2015-10-29 v0.0.19
+
+* New requires_redmine_crm params format and error messages
+
 == 2015-10-28 v0.0.18
 
 * Rename 'requires_version' to 'requires_redmine_crm'

data/lib/redmine_crm.rb

@@ -7,8 +7,6 @@ require "redmine_crm/rcrm_acts_as_taggable"
 require "redmine_crm/helpers/tags_helper"
 require "redmine_crm/currency"
 require "redmine_crm/money_helper"
-
-#version 0.10
 require "redmine_crm/rcrm_acts_as_votable"
 require "redmine_crm/rcrm_acts_as_voter"
 require "redmine_crm/vote"
@@ -20,43 +18,39 @@ if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Voter)
 end
 
-module RedmineCrm
-
-  # class PluginNotFound < StandardError; end
-  class GemRequirementError < StandardError; end
+def requires_redmine_crm(arg)
 
-  def self.compare_versions(requirement, current)
+  def compare_versions(requirement, current)
     requirement = requirement.split('.').collect(&:to_i)
     requirement <=> current.slice(0, requirement.size)
   end
 
-  def self.requires_redmine_crm(plugin, arg)
-    arg = { :version_or_higher => arg } unless arg.is_a?(Hash)
-    arg.assert_valid_keys(:version, :version_or_higher)
-
-    current = VERSION.split(".").map{|x| x.to_i}
-    arg.each do |k, req|
-      case k
-      when :version_or_higher
-        raise ArgumentError.new(":version_or_higher accepts a version string only") unless req.is_a?(String)
-        unless compare_versions(req, current) <= 0
-          raise GemRequirementError.new("#{plugin} plugin requires RedmineCrm gem #{req} or higher but current is #{current.join('.')}")
+  arg = { :version_or_higher => arg } unless arg.is_a?(Hash)
+  arg.assert_valid_keys(:version, :version_or_higher)
+
+  current = RedmineCrm::VERSION.split(".").map{|x| x.to_i}
+  arg.each do |k, req|
+    case k
+    when :version_or_higher
+      raise ArgumentError.new(":version_or_higher accepts a version string only") unless req.is_a?(String)
+      unless compare_versions(req, current) <= 0
+        Rails.logger.error "\033[31m[ERROR]\033[0m Redmine requires redmine_crm gem version #{req} or higher (you're using #{RedmineCrm::VERSION}).\n\033[31m[ERROR]\033[0m Please update with 'bundle update redmine_crm'." if Rails.logger
+        abort "\033[31mRedmine requires redmine_crm gem version #{req} or higher (you're using #{RedmineCrm::VERSION}).\nPlease update with 'bundle update redmine_crm'.\033[0m"
+      end
+    when :version
+      req = [req] if req.is_a?(String)
+      if req.is_a?(Array)
+        unless req.detect {|ver| compare_versions(ver, current) == 0}
+          abort "\033[31mRedmine requires redmine_crm gem version #{req} (you're using #{RedmineCrm::VERSION}).\nPlease update with 'bundle update redmine_crm'.\033[0m"
         end
-      when :version
-        req = [req] if req.is_a?(String)
-        if req.is_a?(Array)
-          unless req.detect {|ver| compare_versions(ver, current) == 0}
-            raise GemRequirementError.new("#{plugin} plugin requires one the following RedmineCrm versions: #{req.join(', ')} but current is #{current.join('.')}")
-          end
-        elsif req.is_a?(Range)
-          unless compare_versions(req.first, current) <= 0 && compare_versions(req.last, current) >= 0
-            raise GemRequirementError.new("#{plugin} plugin requires a RedmineCrm version between #{req.first} and #{req.last} but current is #{current.join('.')}")
-          end
-        else
-          raise ArgumentError.new(":version option accepts a version string, an array or a range of versions")
+      elsif req.is_a?(Range)
+        unless compare_versions(req.first, current) <= 0 && compare_versions(req.last, current) >= 0
+          abort "\033[31mRedmine requires redmine_crm gem version between #{req.first} and #{req.last} (you're using #{RedmineCrm::VERSION}).\nPlease update with 'bundle update redmine_crm'.\033[0m"
         end
+      else
+        raise ArgumentError.new(":version option accepts a version string, an array or a range of versions")
       end
     end
-    true
   end
+  true
 end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/redmine_crm.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RedmineCrm::VERSION
   spec.authors       = ["RedmineCRM"]
   spec.email         = ["support@redminecrm.com"]
-  spec.summary       = %q{plugins for remine}
-  spec.description   = %q{plugins for Redmine}
+  spec.summary       = %q{Common libraries for RedmineCRM plugins for Redmine}
+  spec.description   = %q{Common libraries for RedmineCRM plugins for Redmine. Requered Redmine from http://redmine.org}
   spec.homepage      = ""
   spec.license       = "GPL2"
 

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - RedmineCRM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies: []
-description: plugins for Redmine
+description: Common libraries for RedmineCRM plugins for Redmine. Requered Redmine
+  from http://redmine.org
 email:
 - support@redminecrm.com
 executables: []
@@ -91,7 +92,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: plugins for remine
+summary: Common libraries for RedmineCRM plugins for Redmine
 test_files:
 - test/acts_as_taggable_test.rb
 - test/currency_test.rb