fat_free_crm 0.15.0.beta → 0.15.0.beta.2

data/spec/shared/controllers.rb

@@ -78,7 +78,7 @@ shared_examples "discard" do
   it "should discard the attachment without deleting it" do
     xhr :post, :discard, id: @model.id, attachment: @attachment.class.name, attachment_id: @attachment.id
     expect(assigns[:attachment]).to eq(@attachment.reload)                     # The attachment should still exist.
-    expect(@model.reload.send("#{@attachment.class.name.tableize}")).to eq([]) # But no longer associated with the model.
+    expect(@model.reload.send(@attachment.class.name.tableize.to_s)).to eq([]) # But no longer associated with the model.
     expect(assigns[:account]).to eq(@model) if @model.is_a?(Account)
     expect(assigns[:campaign]).to eq(@model) if @model.is_a?(Campaign)
 

data/spec/support/auth_macros.rb

@@ -17,21 +17,22 @@ end
 #----------------------------------------------------------------------------
 def login(user_stubs = {}, session_stubs = {})
   User.current_user = @current_user = FactoryGirl.create(:user, user_stubs)
-  @current_user_session = double(Authentication, {record: current_user}.merge(session_stubs))
+  @current_user_session = double(Authentication, { record: current_user }.merge(session_stubs))
   allow(Authentication).to receive(:find).and_return(@current_user_session)
-  #set_timezone
+  # set_timezone
 end
 alias :require_user :login
 
 #----------------------------------------------------------------------------
 def login_and_assign(user_stubs = {}, session_stubs = {})
   User.current_user = @current_user = FactoryGirl.build_stubbed(:user, user_stubs)
-  @current_user_session = double(Authentication, {record: current_user}.merge(session_stubs))
+  @current_user_session = double(Authentication, { record: current_user }.merge(session_stubs))
   allow(Authentication).to receive(:find).and_return(@current_user_session)
-  #set_timezone
+  # set_timezone
   assigns[:current_user] = current_user
 end
-def login_and_assign!(user_stubs = {}, session_stubs = {})
+
+def login_and_assign!(_user_stubs = {}, _session_stubs = {})
   login
   assigns[:current_user] = current_user
 end

data/spec/support/macros.rb

@@ -22,7 +22,7 @@ end
 #----------------------------------------------------------------------------
 def stub_task_total(view = "pending")
   settings = (view == "completed" ? Setting.task_completed : Setting.task_bucket)
-  settings.inject(all: 0) { |hash, key| hash[key] = 1; hash }
+  settings.each_with_object(all: 0) { |key, hash| hash[key] = 1; hash }
 end
 
 # Get current server timezone and set it (see rake time:zones:local for details).

data/spec/views/application/auto_complete.haml_spec.rb

@@ -25,10 +25,10 @@ describe "/application/_auto_complete" do
 
       render
       expect(rendered).to have_tag("ul", count: 1) do |list|
-        unless model == :lead
-          expect(list).to have_tag("li", id: @auto_complete.id.to_s, text: @auto_complete.name)
-        else
+        if model == :lead
           expect(list).to have_tag("li", id: @auto_complete.id.to_s, text: "#{@auto_complete.name} (#{@auto_complete.company})")
+        else
+          expect(list).to have_tag("li", id: @auto_complete.id.to_s, text: @auto_complete.name)
         end
       end
     end

data/spec/views/campaigns/show.haml_spec.rb

@@ -11,8 +11,8 @@ describe "/campaigns/show" do
   before do
     login_and_assign
     @campaign = FactoryGirl.build_stubbed(:campaign, id: 42,
-                                              leads: [FactoryGirl.build_stubbed(:lead)],
-                                              opportunities: [FactoryGirl.build_stubbed(:opportunity)])
+                                                     leads: [FactoryGirl.build_stubbed(:lead)],
+                                                     opportunities: [FactoryGirl.build_stubbed(:opportunity)])
     assign(:campaign, @campaign)
     assign(:users, [current_user])
     assign(:comment, Comment.new)

data/spec/views/leads/update.js.haml_spec.rb

@@ -67,7 +67,7 @@ describe "/leads/update" do
       end
 
       it "should update campaign sidebar" do
-        assign(:campaign, campaign = FactoryGirl.build_stubbed(:campaign))
+        assign(:campaign, FactoryGirl.build_stubbed(:campaign))
         render
 
         expect(rendered).to include("sidebar")

data/spec/views/tasks/index.haml_spec.rb

@@ -16,7 +16,7 @@ describe "/tasks/index" do
     before do
       user = FactoryGirl.build_stubbed(:user)
       account = FactoryGirl.build_stubbed(:account)
-      @due  = FactoryGirl.build_stubbed(:task, asset: account, bucket: "due_asap", assignee: user)
+      @due = FactoryGirl.build_stubbed(:task, asset: account, bucket: "due_asap", assignee: user)
       @completed = FactoryGirl.build_stubbed(:task, asset: account, bucket: "completed_today", assignee: user, completed_at: 1.hour.ago, completor: user)
     end
 

data/spec/views/tasks/update.js.haml_spec.rb

@@ -15,7 +15,7 @@ describe "/tasks/update" do
   describe "Changing due date" do
     before do
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, bucket: "due_asap"))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, bucket: "due_tomorrow"))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, bucket: "due_tomorrow"))
       assign(:view, "pending")
       assign(:task_total, stub_task_total("pending"))
     end
@@ -64,7 +64,7 @@ describe "/tasks/update" do
     it "pending task to somebody from Tasks tab: should remove the task and show flash message (assigned)" do
       assignee = FactoryGirl.build_stubbed(:user)
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, assignee: assignee))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: assignee))
       assign(:view, "pending")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
@@ -78,7 +78,7 @@ describe "/tasks/update" do
     it "assigned tasks to me from Tasks tab: should remove the task and show flash message (pending)" do
       assignee = FactoryGirl.build_stubbed(:user)
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: assignee))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, assignee: nil))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: nil))
       assign(:view, "assigned")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
@@ -91,7 +91,7 @@ describe "/tasks/update" do
 
     it "assigned tasks to somebody else from Tasks tab: should re-render task partial" do
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
       assign(:view, "assigned")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
@@ -101,7 +101,7 @@ describe "/tasks/update" do
 
     it "from Tasks tab: should update tasks sidebar" do
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
       assign(:view, "assigned")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
       render
@@ -114,7 +114,7 @@ describe "/tasks/update" do
 
     it "from asset page: should should re-render task partial" do
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
       render
 
       expect(rendered).to include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
@@ -122,7 +122,7 @@ describe "/tasks/update" do
 
     it "from asset page: should update recently viewed items" do
       assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task       = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
       render
 
       expect(rendered).to have_text("Recent Items")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.15.0.beta
+  version: 0.15.0.beta.2
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rails-observers
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -210,6 +213,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: acts_as_commentable
   requirement: !ruby/object:Gem::Requirement
@@ -425,6 +431,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
@@ -432,6 +441,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
@@ -452,6 +464,9 @@ dependencies:
   name: ransack_ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
@@ -459,6 +474,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
@@ -467,6 +485,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :runtime
@@ -474,6 +495,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
@@ -503,6 +527,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".teatro.yml"
 - ".travis.yml"
 - CHANGELOG.md