cloudrider 0.3.21 → 0.3.22

data/generica/config/routes.rb

@@ -28,6 +28,11 @@ Rails.application.routes.draw do
     resources :offers, only: [:show], controller: 'offers/show'
     resources :offers, only: [:destroy], controller: 'offers/destroy'
     resources :offers, only: [:index], controller: 'offers/index'
+    resources :contacts, only: [:create], controller: 'contacts/create'
+    resources :contacts, only: [:update], controller: 'contacts/update'
+    resources :contacts, only: [:destroy], controller: 'contacts/destroy'
+    resources :contacts, only: [:index], controller: 'contacts/index'
+    resources :contacts, only: [:show], controller: 'contacts/show'
   end
 
   namespace :users do

data/generica/db/migrate/20141209185352_create_apiv1_user_contacts.rb

@@ -0,0 +1,14 @@
+class CreateApiv1UserContacts < ActiveRecord::Migration
+  def change
+    create_table :apiv1_user_contacts do |t|
+      t.references :user, index: true
+      t.string :name
+      t.string :phone
+      t.string :email
+      t.string :address
+      t.datetime :made_primary_at
+      t.datetime :deleted_at
+      t.timestamps
+    end
+  end
+end

data/generica/spec/controllers/apiv1/contacts/update_controller_spec.rb

@@ -0,0 +1,59 @@
+require 'rails_helper'
+
+RSpec.describe Apiv1::Contacts::UpdateController do
+  let(:user) { Admin::UserFactory.mock }
+  let(:contact) { user.raw_contacts.create! @contact_params }
+  before do 
+    @contact_params = {
+      name: 'The Dog',
+      phone: '123 41234',
+      email: 'doggie@rat.co',
+      address: '654 Doggie Lane'
+    }
+    controller.auto_login user
+  end
+  
+  describe '#update' do
+    before do
+      time = DateTime.now
+      @update_params = {
+        name: 'End of Disc 3',
+        phone: 'Disc 4',
+        email: 'curious@yes.there',
+        address: 'come across somthing',
+        made_primary_at: time
+      }
+      @expected = {
+        id: contact.id,
+        user_id: user.id,
+        name: 'End of Disc 3',
+        phone: 'Disc 4',
+        email: 'curious@yes.there',
+        address: 'come across somthing'
+      }
+    end
+    let(:update) { -> { put :update, contact: @update_params, id: contact.id } }
+    context 'contact' do
+      before { update.call }
+      subject { JSON.parse(response.body)["contact"].permit("id", "user_id", "name", "phone", "email", "address") }
+      specify { should eq @expected.stringify_keys }
+    end
+    context 'primary' do
+      let(:contact_fetcher) { -> { Admin::User.find(user.id).primary_contact } }
+      subject { update }
+      specify { should change(contact_fetcher, :call).from(nil).to(contact) }
+    end
+    context 'change' do
+      before { update.call }
+      let(:cont) { Apiv1::UserContact.find contact.id }
+      context 'name' do
+        subject { cont.name }
+        specify { should eq @expected[:name] }
+      end
+      context 'status' do
+        subject { cont.made_primary_at.to_formatted_s(:db) }
+        specify { should > @update_params[:made_primary_at].to_formatted_s(:db) } 
+      end
+    end
+  end
+end

data/generica/spec/factories/admin/user_factory.rb

@@ -10,13 +10,31 @@
 #  updated_at                   :datetime
 #  remember_me_token            :string(255)
 #  remember_me_token_expires_at :datetime
+#  user_rank                    :string(255)
+#  company_name                 :string(255)
+#  phone_number                 :string(255)
+#  about_me                     :text
+#  address                      :string(255)
 #
 
 class Admin::UserFactory < Apiv1::BaseFactory
+  class << self
+    def mock
+      Admin::User.new(attributes).tap(&:save!)
+    end
+    def attributes
+      {
+        email: Faker::Internet.email,
+        password: "asdf123",
+        password_confirmation: "asdf123",
+        company_name: Faker::Company.name,
+        phone_number: '554654',
+        address: Faker::AddressUS.street_address,
+        user_rank: 'admin'
+      }
+    end
+  end
   def attributes
-    {
-      email: Faker::Internet.email,
-      password: "asdf123"
-    }
+    self.class.attributes
   end
 end

data/generica/spec/models/apiv1/user_contact_spec.rb

@@ -0,0 +1,70 @@
+# == Schema Information
+#
+# Table name: apiv1_user_contacts
+#
+#  id              :integer          not null, primary key
+#  user_id         :integer
+#  name            :string(255)
+#  phone           :string(255)
+#  email           :string(255)
+#  address         :string(255)
+#  made_primary_at :datetime
+#  deleted_at      :datetime
+#  created_at      :datetime
+#  updated_at      :datetime
+#
+
+require 'rails_helper'
+
+RSpec.describe Apiv1::UserContact do
+  let(:user) { Admin::UserFactory.mock }
+  let(:contact) { user.contacts.new @contact_params }
+  before do
+    @contact_params = {
+      name: 'Harold Hardcastle Co.',
+      phone: 'Devonture 314',
+      email: 'hardcastle@police.co.uk',
+      address: '44 Wilbehelm Crescent, Devonture England',
+      status: 'primary'
+    }
+  end
+  context '#to_ember_hash' do
+    before { contact.save! }
+    context 'ownership' do 
+      subject { contact.user }
+      specify { should eq user }
+    end
+    context 'equality' do
+      before do
+        @expected = {
+          id: user.id,
+          email: contact.email,
+          user_rank: user.user_rank,
+          company_name: contact.name,
+          phone_number: contact.phone,
+          address: contact.address,
+          about_me: nil
+        }
+      end
+      subject { user.to_ember_hash }
+      specify { should eq @expected }
+    end
+  end
+  describe '#make_primary!' do
+    let(:alt_contact) { user.contacts.create! @alt_params }
+    let(:contact_fetcher) { -> { Admin::User.find(user.id).primary_contact } }
+    before do
+      @alt_params = {
+        name: 'Following Day',
+        phone: '23 23423',
+        email: 'american@sharp.co',
+        address: 'stuff where nowhere'
+      }
+      @contact_fetcher = -> { Apiv1::UserContact.find(contact.id).status }
+      contact.save!
+    end
+    subject { -> { alt_contact.make_primary! } }
+    specify { should change(contact_fetcher, :call).from(contact).to(alt_contact) }
+    specify { should change(@contact_fetcher, :call).from('primary').to(nil) }
+  end
+end

data/lib/cloudrider/version.rb

@@ -1,3 +1,3 @@
 module Cloudrider
-  VERSION = "0.3.21"
+  VERSION = "0.3.22"
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudrider
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
 platform: ruby
 authors:
 - Thomas Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,11 +197,16 @@ files:
 - generica/app/assets/javascripts/controllers/application_controller.js.em
 - generica/app/assets/javascripts/controllers/index_controller.js.em
 - generica/app/assets/javascripts/controllers/messages/new_controller.js.em
+- generica/app/assets/javascripts/controllers/modals/fork_controller.js.em
 - generica/app/assets/javascripts/controllers/modals/login_controller.js.em
 - generica/app/assets/javascripts/controllers/modals/register_controller.js.em
 - generica/app/assets/javascripts/controllers/products/index_controller.js.em
 - generica/app/assets/javascripts/controllers/products/product/offers/new_controller.js.em
 - generica/app/assets/javascripts/controllers/products/product/show_controller.js.em
+- generica/app/assets/javascripts/controllers/users/contact/edit_controller.js.em
+- generica/app/assets/javascripts/controllers/users/contacts/index_controller.js.em
+- generica/app/assets/javascripts/controllers/users/contacts/new_controller.js.em
+- generica/app/assets/javascripts/controllers/users/index_controller.js.em
 - generica/app/assets/javascripts/controllers/users/offers/index_controller.js.em
 - generica/app/assets/javascripts/controllers/users/product/edit_controller.js.em
 - generica/app/assets/javascripts/controllers/users/products/index_controller.js.em
@@ -224,6 +229,7 @@ files:
 - generica/app/assets/javascripts/models/admin/session.js.em
 - generica/app/assets/javascripts/models/admin/taxon.js.em
 - generica/app/assets/javascripts/models/attachment.js.em
+- generica/app/assets/javascripts/models/contact.js.em
 - generica/app/assets/javascripts/models/employee.js.em
 - generica/app/assets/javascripts/models/listing.js.em
 - generica/app/assets/javascripts/models/message.js.em
@@ -259,6 +265,10 @@ files:
 - generica/app/assets/javascripts/routes/products/index_route.js.em
 - generica/app/assets/javascripts/routes/products/product/offers/new_route.js.em
 - generica/app/assets/javascripts/routes/products_route.js.em
+- generica/app/assets/javascripts/routes/users/contact_route.js.em
+- generica/app/assets/javascripts/routes/users/contacts/index_route.js.em
+- generica/app/assets/javascripts/routes/users/contacts/new_route.js.em
+- generica/app/assets/javascripts/routes/users/index_route.js.em
 - generica/app/assets/javascripts/routes/users/offers/index_route.js.em
 - generica/app/assets/javascripts/routes/users/product_route.js.em
 - generica/app/assets/javascripts/routes/users/products/index_route.js.em
@@ -334,6 +344,10 @@ files:
 - generica/app/assets/javascripts/templates/products/product/offers/new.emblem
 - generica/app/assets/javascripts/templates/products/product/show.emblem
 - generica/app/assets/javascripts/templates/users.emblem
+- generica/app/assets/javascripts/templates/users/contact/edit.emblem
+- generica/app/assets/javascripts/templates/users/contacts/_form-core.emblem
+- generica/app/assets/javascripts/templates/users/contacts/index.emblem
+- generica/app/assets/javascripts/templates/users/contacts/new.emblem
 - generica/app/assets/javascripts/templates/users/index.emblem
 - generica/app/assets/javascripts/templates/users/offers/index.emblem
 - generica/app/assets/javascripts/templates/users/offers/slice.emblem
@@ -395,6 +409,11 @@ files:
 - generica/app/controllers/admin/sessions/create_controller.rb
 - generica/app/controllers/admin/sessions/destroy_controller.rb
 - generica/app/controllers/admin/taxons/create_controller.rb
+- generica/app/controllers/apiv1/contacts/create_controller.rb
+- generica/app/controllers/apiv1/contacts/destroy_controller.rb
+- generica/app/controllers/apiv1/contacts/index_controller.rb
+- generica/app/controllers/apiv1/contacts/show_controller.rb
+- generica/app/controllers/apiv1/contacts/update_controller.rb
 - generica/app/controllers/apiv1/employees/destroy_controller.rb
 - generica/app/controllers/apiv1/employees/index_controller.rb
 - generica/app/controllers/apiv1/home_controller.rb
@@ -460,6 +479,7 @@ files:
 - generica/app/models/apiv1/taxon.rb
 - generica/app/models/apiv1/translation.rb
 - generica/app/models/apiv1/translation_machine.rb
+- generica/app/models/apiv1/user_contact.rb
 - generica/app/models/apiv1/users/product_factory.rb
 - generica/app/models/apiv1/users/product_relationship.rb
 - generica/app/models/concerns/.keep
@@ -570,6 +590,7 @@ files:
 - generica/db/migrate/20141116235808_add_deleted_at_to_apiv1_attachments.rb
 - generica/db/migrate/20141127230304_create_apiv1_email_requests.rb
 - generica/db/migrate/20141127230455_create_apiv1_email_objects.rb
+- generica/db/migrate/20141209185352_create_apiv1_user_contacts.rb
 - generica/db/schema.rb
 - generica/db/seeds.rb
 - generica/db/seeds/dimensions.rb
@@ -614,6 +635,7 @@ files:
 - generica/spec/controllers/admin/products/update_controller_spec.rb
 - generica/spec/controllers/admin/sessions/create_controller_spec.rb
 - generica/spec/controllers/admin/taxons/create_controller_spec.rb
+- generica/spec/controllers/apiv1/contacts/update_controller_spec.rb
 - generica/spec/controllers/apiv1/messages/index_controller_spec.rb
 - generica/spec/controllers/apiv1/pictures/destroy_controller_spec.rb
 - generica/spec/controllers/apiv1/taxons/index_controller_spec.rb
@@ -640,6 +662,7 @@ files:
 - generica/spec/models/apiv1/products/offer_message_factory_spec.rb
 - generica/spec/models/apiv1/products_machine_spec.rb
 - generica/spec/models/apiv1/translation_spec.rb
+- generica/spec/models/apiv1/user_contact_spec.rb
 - generica/spec/models/apiv1/users/product_factory_spec.rb
 - generica/spec/models/i18n/backend/active_record_spec.rb
 - generica/spec/models/users/products/offer_factory_spec.rb