restpack_activity_service 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b6ae7c8d302326bf65855e0e574a3084907f967
-  data.tar.gz: 531df84eac823dc7e5dcc27bd8a01cbf270d0cdb
+  metadata.gz: 4d6a465f44d89c820a690574414c948640888cce
+  data.tar.gz: 5e3e1b20e053755f267fbb0db17d6f287995f622
 SHA512:
-  metadata.gz: b496a279f1d3fb4fcaae5ad7632eee528966c2f8ff3f1560f052b382dd44e50468a2dd62ae21fd697b5c08f938f52d4907e019a89138c6d13215d8b9768d0f55
-  data.tar.gz: df6c4ffc8fd2337d38f3e64062eaa755c1017f502fd2c45f52c7a10aa07609807eb22dc08035fd87179fd12dac879fca4b3ef6afb20c0512dbfce3439d7c67a1
+  metadata.gz: c0fad183aa52e01eeaad4f8bc2fe915f8742d95ba80f974dc2a6056a8aa9e0728f1c2c8ae5764f15a83ba6ea9a2a6d3dac05f49ad575433af6a84f8537abd412
+  data.tar.gz: 5c971b677f18023bfd64121df732e250c1f8997018f7cdf51a7aba97da575c8b0e5d9ab74f85ffb26525e271196452ab9d2fbc0f4214984e9861b13e092eb614

data/db/migrate/{20130630145408_create_activity_table.rb → 20130630145409_create_activity_table.rb}

@@ -1,6 +1,6 @@
 class CreateActivityTable < ActiveRecord::Migration
   def table_name
-    :restpack_activities
+    :restpack_activity_activities
   end
 
   def up

data/lib/restpack_activity_service.rb

@@ -1,4 +1,4 @@
 require 'restpack_service'
-RestPack::Service::Loader.load 'activity'
+RestPack::Service::Loader.load 'restpack_activity_service', 'Activities'
 
 require "restpack_activity_service/api/activity"

data/lib/restpack_activity_service/commands/activity/create.rb

@@ -1,41 +1,34 @@
-module RestPack::Activity::Service::Commands
-  module Activity
-    class Create < RestPack::Service::Command
-      required do
-        integer :application_id
-        integer :user_id
-        string  :content
-      end
-
-      optional do
-        string  :title, empty: true
-        string  :tags, empty: true
-        string  :access, empty: true
-        float   :latitude
-        float   :longitude
-      end
-
-      def init
-        inputs[:data] = raw_inputs[:data] if raw_inputs[:data]
+module Commands::Activities::Activity
+  class Create < RestPack::Service::Commands::SingleCreate
+    required do
+      integer :application_id
+      integer :user_id
+      string  :content
+    end
 
-        if latitude.present? || longitude.present?
-          if latitude.present? != longitude.present?
-            service_error "Both Latitude and Longitude are required"
-          end
-        end
+    optional do
+      string  :title, empty: true
+      string  :tags, empty: true
+      string  :access, empty: true
+      float   :latitude
+      float   :longitude
+      model   :data, class: Hash
+    end
 
-        if title == "error"
-          service_error "This is a service error"
+    def init
+      if latitude.present? || longitude.present?
+        if latitude.present? != longitude.present?
+          service_error "Both Latitude and Longitude are required"
         end
+      end
 
-        if title == "custom"
-          field_error :title, "Title should not be 'custom'"
-        end
+      #TEMP: GJ: some example service errors
+      if title == "error"
+        service_error "This is a service error"
       end
 
-      def execute
-        activity = Models::Activity.create(inputs)
-        Serializers::Activity.as_json(activity)
+      if title == "custom"
+        field_error :title, "Title should not be 'custom'"
       end
     end
   end

data/lib/restpack_activity_service/commands/activity/destroy.rb

@@ -1,23 +1,21 @@
-module RestPack::Activity::Service::Commands
-  module Activity
-    class Destroy < RestPack::Service::Command
-      required do
-        integer :id
-        integer :application_id
-      end
+module Commands::Activities::Activity
+  class Destroy < RestPack::Service::Command
+    required do
+      integer :id
+      integer :application_id
+    end
 
-      def execute
-        activity = Models::Activity.find_by_id_and_application_id(
-          inputs[:id],
-          inputs[:application_id]
-        )
+    def execute
+      activity = Models::Activities::Activity.find_by_id_and_application_id(
+        inputs[:id],
+        inputs[:application_id]
+      )
 
-        if activity
-          activity.destroy
-          nil
-        else
-          status :not_found
-        end
+      if activity
+        activity.destroy
+        nil
+      else
+        status :not_found
       end
     end
   end

data/lib/restpack_activity_service/commands/activity/get.rb

@@ -1,23 +1,8 @@
-module RestPack::Activity::Service::Commands
-  module Activity
-    class Get < RestPack::Service::Command
-      required do
-        integer :id
-        integer :application_id
-      end
-
-      def execute
-        activity = Models::Activity.find_by_id_and_application_id(
-          inputs[:id],
-          inputs[:application_id]
-        )
-
-        if activity
-          Serializers::Activity.as_json(activity)
-        else
-          status :not_found
-        end
-      end
+module Commands::Activities::Activity
+  class Get < RestPack::Service::Commands::Get
+    required do
+      integer :id
+      integer :application_id
     end
   end
 end

data/lib/restpack_activity_service/commands/activity/list.rb

@@ -1,30 +1,28 @@
-module RestPack::Activity::Service::Commands
-  module Activity
-    class List < RestPack::Service::Command
-      required do
-        integer :application_id
-      end
+module Commands::Activities::Activity
+  class List < RestPack::Service::Command
+    required do
+      integer :application_id
+    end
 
-      optional do
-        integer :user_id
-        integer :page
-        integer :page_size
-        string  :tags
-        string  :access
-        string  :query
-      end
+    optional do
+      integer :user_id
+      integer :page
+      integer :page_size
+      string  :tags
+      string  :access
+      string  :query
+    end
 
-      def execute
-        scope = Models::Activity.all
-        scope = scope.where(application_id: application_id)
+    def execute
+      scope = Models::Activities::Activity.all
+      scope = scope.where(application_id: application_id)
 
-        scope = scope.where(user_id: user_id) if user_id
-        scope = scope.all_tags_csv(tags) if tags
-        scope = scope.any_tags_csv(access, :access) if access
-        scope = scope.search(query) if query
+      scope = scope.where(user_id: user_id) if user_id
+      scope = scope.all_tags_csv(tags) if tags
+      scope = scope.any_tags_csv(access, :access) if access
+      scope = scope.search(query) if query
 
-        Serializers::Activity.resource(inputs, scope)
-      end
+      Serializers::Activities::Activity.resource(inputs, scope)
     end
   end
 end

data/lib/restpack_activity_service/commands/activity/update.rb

@@ -1,35 +1,33 @@
-module RestPack::Activity::Service::Commands
-  module Activity
-    class Update < RestPack::Service::Command
-      required do
-        integer :id
-        integer :application_id
-      end
+module Commands::Activities::Activity
+  class Update < RestPack::Service::Command
+    required do
+      integer :id
+      integer :application_id
+    end
 
-      optional do
-        string  :title, empty: true
-        string  :content
-        string  :tags, empty: true
-        string  :access, empty: true
-        float   :latitude
-        float   :longitude
-      end
+    optional do
+      string  :title, empty: true
+      string  :content
+      string  :tags, empty: true
+      string  :access, empty: true
+      float   :latitude
+      float   :longitude
+    end
 
-      def init
-        inputs[:data] = raw_inputs[:data] if raw_inputs[:data]
-      end
+    def init
+      inputs[:data] = raw_inputs[:data] if raw_inputs[:data]
+    end
 
-      def execute
-        activity = Models::Activity.find_by_id_and_application_id(
-          inputs[:id], inputs[:application_id]
-        )
+    def execute
+      activity = Models::Activities::Activity.find_by_id_and_application_id(
+        inputs[:id], inputs[:application_id]
+      )
 
-        if activity
-          activity.update_attributes(inputs)
-          Serializers::Activity.as_json(activity)
-        else
-          status :not_found
-        end
+      if activity
+        activity.update_attributes(inputs)
+        Serializers::Activities::Activity.as_json(activity)
+      else
+        status :not_found
       end
     end
   end

data/lib/restpack_activity_service/jobs/activity/create.rb

@@ -0,0 +1,15 @@
+require 'sidekiq'
+
+module Jobs
+  module Activities
+    module Activity
+      class Create
+        include Sidekiq::Worker
+
+        def perform(params)
+          Commands::Activities::Activity::Create::run(params)
+        end
+      end
+    end
+  end
+end

data/lib/restpack_activity_service/models/activity.rb

@@ -1,6 +1,9 @@
-module RestPack::Activity::Service::Models
+module Models::Activities
   class Activity < ActiveRecord::Base
-    self.table_name = :restpack_activities
+    self.table_name = :restpack_activity_activities
+
+    attr_accessible :application_id, :user_id, :title, :content,
+                    :latitude, :longitude, :data, :tags, :access
 
     def self.search(query)
       conditions = <<-EOS

data/lib/restpack_activity_service/serializers/activity.rb

@@ -1,8 +1,8 @@
-module RestPack::Activity::Service::Serializers
+module Serializers::Activities
   class Activity
     include RestPack::Serializer
 
-    self.model_class = Models::Activity
+    self.model_class = Models::Activities::Activity
     self.key = :activities
 
     attributes :id, :application_id, :user_id, :title, :content, :latitude, :longitude,

data/lib/restpack_activity_service/version.rb

@@ -1,7 +1,7 @@
 module RestPack
   module Activity
     module Service
-      VERSION = "0.0.12"
+      VERSION = "0.0.13"
     end
   end
 end

data/spec/factories/activity_factory.rb

@@ -1,19 +1,8 @@
-class ActivityFactory
-  def self.create(params = {})
-    params.reverse_merge!({
-      application_id: 456,
-      user_id: 123,
-      content: "This is the content ##{sequence}"
-    })
-
-    Commands::Activity::Create.run!(params)
-  end
-
-  private
-
-  def self.sequence
-    @@sequence ||= 0
-    @@sequence += 1
-    @@sequence
+FactoryGirl.define do
+  factory :activity, :class => Models::Activities::Activity do
+    sequence(:application_id)
+    sequence(:user_id)
+    sequence(:title)        {|n| "Title ##{n}" }
+    sequence(:content)      {|n| "Content ##{n}" }
   end
 end

data/spec/factories/api_activity_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :api_activity, class: Hash do
+    sequence(:application_id)
+    sequence(:user_id)
+    sequence(:content)      {|n| "Content ##{n}" }
+    sequence(:title)        {|n| "Title ##{n}" }
+
+    initialize_with { attributes }
+  end
+end

data/spec/services/create_spec.rb

@@ -1,6 +1,8 @@
-require_relative '../spec_helper'
+require 'spec_helper'
+
+describe Commands::Activities::Activity::Create do
+  it_acts_as_single_create_command(:activities, :activity)
 
-describe Commands::Activity::Create do
   is_required :application_id, :user_id, :content
   is_optional :title, :tags, :access, :latitude, :longitude
 

data/spec/services/destroy_spec.rb

@@ -1,13 +1,13 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
-describe Commands::Activity::Destroy do
+describe Commands::Activities::Activity::Destroy do
   is_required :id, :application_id
 
   let(:response) { subject.class.run(params) }
   let(:params) { {} }
 
   before do
-    @activity = ActivityFactory.create({ application_id: 100, title: 'test activity' })
+    @activity = create(:activity, application_id: 100, title: 'test activity' )
   end
 
   context 'with valid params' do
@@ -19,7 +19,7 @@ describe Commands::Activity::Destroy do
     it 'deletes the activity' do
       response.success?.should == true
       response.result.should == {}
-      Commands::Activity::Get.run(params).status.should == :not_found
+      Commands::Activities::Activity::Get.run(params).status.should == :not_found
     end
   end
 

data/spec/services/get_spec.rb

@@ -1,13 +1,13 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
-describe Commands::Activity::Get do
+describe Commands::Activities::Activity::Get do
   is_required :id, :application_id
 
   let(:response) { subject.class.run(params) }
   let(:params) { {} }
 
   before do
-    @activity = ActivityFactory.create({ application_id: 100, title: 'test activity' })
+    @activity = create(:activity)
   end
 
   context 'with valid params' do
@@ -18,7 +18,7 @@ describe Commands::Activity::Get do
 
     it 'returns the correct activity' do
       response.success?.should == true
-      response.result.should == @activity
+      response.result.should == Serializers::Activities::Activity.resource(@activity)
     end
   end
 

data/spec/services/list_spec.rb

@@ -1,25 +1,25 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
-describe Commands::Activity::List do
+describe Commands::Activities::Activity::List do
   is_required :application_id
   is_optional :user_id, :page, :page_size, :tags, :access, :query
 
   before do
-    ActivityFactory.create({
+    create(:activity,
       application_id: 100, user_id: 200, title: 'Achievement Unlocked 1',
       content: 'Three in a row! You have unlocked the "three-in-a-row" achievement.',
       tags: 'achievement,three in a row',
       access: 'user:100,group:300'
-    })
+    )
 
-    ActivityFactory.create({
+    create(:activity,
       application_id: 100, user_id: 200, title: 'Achievement Unlocked 2',
       content: 'Five in a row! You have unlocked the "five-in-a-row" achievement.',
       tags: 'achievement,five in a row',
       access: 'user:100,group:300'
-    })
+    )
 
-    ActivityFactory.create({
+    create(:activity,
       application_id: 100, user_id: 200, title: '3 Photos Uploaded',
       content: '3 photos have been uploaded',
       tags: 'photos',
@@ -27,16 +27,16 @@ describe Commands::Activity::List do
       data: {
         photos: ['1.png', '2.png', '3.png']
       }
-    })
+    )
 
-    ActivityFactory.create({
+    create(:activity,
       application_id: 100, user_id: 200, title: 'Check In: Eatery120',
       content: 'You checked in to Eatery 130, Ranelagh, Dublin 6',
       tags: 'checkin,eatery120,ranelagh,dublin',
       access: 'user:100,public',
       latitude: 53.324577,
       longitude: -6.254193
-    })
+    )
   end
 
   context 'listing activities' do
@@ -46,7 +46,7 @@ describe Commands::Activity::List do
       context 'valid' do
         let(:params) { { application_id: 100 } }
         it 'retuns activities' do
-          response.result[:meta][:activities][:count].should == Models::Activity.count
+          response.result[:meta][:activities][:count].should == Models::Activities::Activity.count
         end
       end
 
@@ -63,7 +63,7 @@ describe Commands::Activity::List do
         let(:params) { { application_id: 100, user_id: 200 }}
 
         it 'returns activities' do
-          response.result[:meta][:activities][:count].should == Models::Activity.count
+          response.result[:meta][:activities][:count].should == Models::Activities::Activity.count
         end
       end
 

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 require 'restpack_service/support/spec_helper'
 require 'restpack_activity_service'
 
-require_relative 'factories/activity_factory'
-
 require 'coveralls'
 Coveralls.wear!
 
@@ -13,9 +11,13 @@ migrations_path = File.dirname(__FILE__) + "/../db/migrate"
 migrator = ActiveRecord::Migrator.new(:up, migrations_path)
 migrator.migrate
 
+FactoryGirl.find_definitions
+
 DatabaseCleaner.strategy = :transaction
 
 RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+
   config.before(:each) do
     DatabaseCleaner.start
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_activity_service
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_service
@@ -136,7 +136,7 @@ files:
 - README.md
 - Rakefile
 - config/database.yml
-- db/migrate/20130630145408_create_activity_table.rb
+- db/migrate/20130630145409_create_activity_table.rb
 - lib/restpack_activity_service.rb
 - lib/restpack_activity_service/api/activity.rb
 - lib/restpack_activity_service/commands/activity/create.rb
@@ -145,14 +145,15 @@ files:
 - lib/restpack_activity_service/commands/activity/list.rb
 - lib/restpack_activity_service/commands/activity/update.rb
 - lib/restpack_activity_service/configuration.rb
+- lib/restpack_activity_service/jobs/activity/create.rb
 - lib/restpack_activity_service/models/activity.rb
 - lib/restpack_activity_service/serializers/activity.rb
-- lib/restpack_activity_service/services.rb
 - lib/restpack_activity_service/tasks/db.rake
 - lib/restpack_activity_service/tasks/tasks.rb
 - lib/restpack_activity_service/version.rb
 - restpack_activity_service.gemspec
 - spec/factories/activity_factory.rb
+- spec/factories/api_activity_factory.rb
 - spec/services/create_spec.rb
 - spec/services/destroy_spec.rb
 - spec/services/get_spec.rb
@@ -184,6 +185,7 @@ specification_version: 4
 summary: Simple Activity Streams
 test_files:
 - spec/factories/activity_factory.rb
+- spec/factories/api_activity_factory.rb
 - spec/services/create_spec.rb
 - spec/services/destroy_spec.rb
 - spec/services/get_spec.rb

data/lib/restpack_activity_service/services.rb

@@ -1,9 +0,0 @@
-module RestPack::Activity::Service::Commands
-
-end
-
-require "restpack_activity_service/services/activity/list"
-require "restpack_activity_service/services/activity/create"
-require "restpack_activity_service/services/activity/get"
-require "restpack_activity_service/services/activity/update"
-require "restpack_activity_service/services/activity/destroy"