restpack_activity_service 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c21c2223191cc1477b4843304085bd0b380e77fb
-  data.tar.gz: 4e2cf984b5d20f21b545a01c9c3126b33ec6de2c
+  metadata.gz: e09bdad0ec250540f53fba875ba0373330d96b87
+  data.tar.gz: 3ea93c0cc8c832d6a485aec4e12017a60c4cd8d5
 SHA512:
-  metadata.gz: 9dbdf52da0c4c30647641c66bdc388c903afa8f8c558cf809a807188a83e899bb452978d6a5ba6992cbdec2ac61aec77f279f21a4afb20a0d9685cb8bcfc5ea5
-  data.tar.gz: c19e259f1a51650812725026b047bf140bedbefe2b130813b07bea7a88209b7acda34ee5531fe0ce696c1ca320653b1872c4821a16942a02267d6967c508f921
+  metadata.gz: 9bd634abf3779e46c5f088e97bed4c3189c617cd5a787f9076ba749d39c02945a06278d8721018bf95394eb50411e52c6eb3a5a1b6657223d3cf56aa88fd08ed
+  data.tar.gz: 8fe40b5310e7a0ab1409c7b90c3639ea89da0589cd7336e9dd2e863415d9510935c5ece805f0aa8f23a9acbb65c157f877333bb3e86b0bb6c1d956384d21b8d6

data/.travis.yml

@@ -1,6 +1,20 @@
 language: ruby
 rvm:
   - 2.0.0
-env:
-  - DATABASE_URL=$(curl http://api.postgression.com)
+#http://reefpoints.dockyard.com/ruby/2013/03/29/running-postgresql-9-2-on-travis-ci.html
+before_script:
+  - sudo /etc/init.d/postgresql stop
+  - sudo cp /etc/postgresql/9.1/main/pg_hba.conf ./
+  - sudo apt-get remove postgresql postgresql-9.1 -qq --purge
+  - source /etc/lsb-release
+  - echo "deb http://apt.postgresql.org/pub/repos/apt/ $DISTRIB_CODENAME-pgdg main" > pgdg.list
+  - sudo mv pgdg.list /etc/apt/sources.list.d/
+  - wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -
+  - sudo apt-get update
+  - sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install postgresql-9.2 postgresql-contrib-9.2 -qq
+  - sudo /etc/init.d/postgresql stop
+  - sudo cp ./pg_hba.conf /etc/postgresql/9.2/main
+  - sudo /etc/init.d/postgresql start
+  - psql -c 'create database restpack_activity_service_test;' -U postgres
+  - psql -c 'create role travis login;' -U postgres
 script: bundle exec rake test

data/lib/restpack_activity_service.rb

@@ -1,17 +1,4 @@
-require "active_record"
-require "restpack_service"
-require "restpack_serializer"
-
-require "restpack_activity_service/version"
-require "restpack_activity_service/configuration"
-require "restpack_activity_service/models/activity"
-
-require "restpack_activity_service/serializers/activity_serializer"
-require "restpack_activity_service/services"
-require "restpack_activity_service/tasks"
+require 'restpack_service'
+RestPack::Service::Loader.load 'activity', Dir.pwd
 
 require "restpack_activity_service/api/activity"
-
-Models = RestPack::Activity::Service::Models
-Commands = RestPack::Activity::Service::Commands
-Serializers = RestPack::Activity::Service::Serializers

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

@@ -0,0 +1,42 @@
+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]
+
+        if latitude.present? || longitude.present?
+          if latitude.present? != longitude.present?
+            service_error "Both Latitude and Longitude are required"
+          end
+        end
+
+        if title == "error"
+          service_error "This is a service error"
+        end
+
+        if title == "custom"
+          field_error :title, "Title should not be 'custom'"
+        end
+      end
+
+      def execute
+        activity = Models::Activity.create(inputs)
+        Serializers::Activity.as_json(activity)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module RestPack::Activity::Service::Commands
+  module 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]
+        )
+
+        if activity
+          activity.destroy
+          nil
+        else
+          status :not_found
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+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
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module RestPack::Activity::Service::Commands
+  module 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
+
+      def execute
+        scope = Models::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
+
+        Serializers::Activity.resource(inputs, scope)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module RestPack::Activity::Service::Commands
+  module 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
+
+      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]
+        )
+
+        if activity
+          activity.update_attributes(inputs)
+          Serializers::Activity.as_json(activity)
+        else
+          status :not_found
+        end
+      end
+    end
+  end
+end

data/lib/restpack_activity_service/serializers/{activity_serializer.rb → activity.rb}

@@ -1,8 +1,8 @@
 module RestPack::Activity::Service::Serializers
-  class ActivitySerializer
+  class Activity
     include RestPack::Serializer
 
-    self.model_class = RestPack::Activity::Service::Models::Activity
+    self.model_class = Models::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.10"
+      VERSION = "0.0.11"
     end
   end
 end

data/restpack_activity_service.gemspec

@@ -19,10 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "restpack_service"
-  spec.add_dependency "restpack_serializer"
-  spec.add_dependency "restpack_gem"
-  spec.add_dependency "sinatra",                "~> 1.4.3"
-  spec.add_dependency "pg",                     "~> 0.16"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "database_cleaner", "~> 1.0.1"

data/spec/factories/activity_factory.rb

@@ -6,7 +6,7 @@ class ActivityFactory
       content: "This is the content ##{sequence}"
     })
 
-    RestPack::Activity::Service::Commands::Activity::Create.run!(params)
+    Commands::Activity::Create.run!(params)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_activity_service
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_service
@@ -24,62 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: restpack_serializer
-  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: restpack_gem
-  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: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.3
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -195,17 +139,17 @@ files:
 - db/migrate/20130630145408_create_activity_table.rb
 - lib/restpack_activity_service.rb
 - lib/restpack_activity_service/api/activity.rb
+- lib/restpack_activity_service/commands/activity/create.rb
+- lib/restpack_activity_service/commands/activity/destroy.rb
+- lib/restpack_activity_service/commands/activity/get.rb
+- 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/models/activity.rb
-- lib/restpack_activity_service/serializers/activity_serializer.rb
+- lib/restpack_activity_service/serializers/activity.rb
 - lib/restpack_activity_service/services.rb
-- lib/restpack_activity_service/services/activity/create.rb
-- lib/restpack_activity_service/services/activity/destroy.rb
-- lib/restpack_activity_service/services/activity/get.rb
-- lib/restpack_activity_service/services/activity/list.rb
-- lib/restpack_activity_service/services/activity/update.rb
-- lib/restpack_activity_service/tasks.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
@@ -234,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Simple Activity Streams

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

@@ -1,40 +0,0 @@
-module RestPack::Activity::Service::Commands::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]
-
-      if latitude.present? || longitude.present?
-        if latitude.present? != longitude.present?
-          service_error "Both Latitude and Longitude are required"
-        end
-      end
-
-      if title == "error"
-        service_error "This is a service error"
-      end
-
-      if title == "custom"
-        field_error :title, "Title should not be 'custom'"
-      end
-    end
-
-    def execute
-      activity = Models::Activity.create(inputs)
-      Serializers::ActivitySerializer.as_json(activity)
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-module RestPack::Activity::Service::Commands::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]
-      )
-
-      if activity
-        activity.destroy
-        nil
-      else
-        status :not_found
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module RestPack::Activity::Service::Commands::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::ActivitySerializer.as_json(activity)
-      else
-        status :not_found
-      end
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-module RestPack::Activity::Service::Commands::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
-
-    def execute
-      scope = Models::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
-
-      Serializers::ActivitySerializer.resource(inputs, scope)
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-module RestPack::Activity::Service::Commands::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
-
-    def init
-      inputs[:data] = raw_inputs[:data] if raw_inputs[:data]
-    end
-
-    def execute
-      activity = RestPack::Activity::Service::Models::Activity.find_by_id_and_application_id(inputs[:id], inputs[:application_id])
-
-      if activity
-        activity.update_attributes(inputs)
-        RestPack::Activity::Service::Serializers::ActivitySerializer.as_json(activity)
-      else
-        status :not_found
-      end
-    end
-  end
-end