restpack_core_service 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c467348e3e91b7a334c8b6395bbf0f9ece4eaa6
-  data.tar.gz: e324bb1a482ce12b3cdda1c1e859bcba2ccdbc0d
+  metadata.gz: 504634bab2bf42ecded107859f2945e18a0df86f
+  data.tar.gz: d8d5fedf8d9dce3edc41bc5d3cf6bbce4e254be7
 SHA512:
-  metadata.gz: ae5463db0dc91a0e57b4d3552efbc7f226859e449da3491ef63102a562087d58faa1ea7e03c4053000f770d519c38dd7e682a8cb4bbfd2bb68708bcad28320dc
-  data.tar.gz: 3b15476dbb5dbbe8fe05eb6facea0b88d46c875a9fd694caadd130206c31e88f2bc71368bc290b213409a87baa8299dfa5a0ec7db0665f492b30c960c6c4c296
+  metadata.gz: d8bd5796073fbd62000fe529561a636508aaa2039561e04cd86c46fcff8bc00dbc54446bf087ea0805edc11c9acaa44f3381f9e72bb21eb4b5e168ec841b9f4a
+  data.tar.gz: bc2c6b127ba0757ea07d0ed3006ecb3db2613f3e55551ea9b7f28bd6b46a1d39939ea15d4d0126074279d6e272d0ff19c4859f6c267798acda098b10d6063f40

data/.travis.yml

@@ -0,0 +1,20 @@
+language: ruby
+rvm:
+  - 2.0.0
+#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_core_service_test;' -U postgres
+  - psql -c 'create role travis login;' -U postgres
+script: bundle exec rake test

data/README.md

@@ -1,29 +1,13 @@
-# RestpackCoreService
+# restpack_core_service
 
-TODO: Write a gem description
+[![Build Status](https://travis-ci.org/RestPack/restpack_core_service.png?branch=master)](https://travis-ci.org/RestPack/restpack_core_service) [![Code Climate](https://codeclimate.com/github/RestPack/restpack_core_service.png)](https://codeclimate.com/github/RestPack/restpack_core_service) [![Dependency Status](https://gemnasium.com/RestPack/restpack_core_service.png)](https://gemnasium.com/RestPack/restpack_core_service) [![Gem Version](https://badge.fury.io/rb/restpack_core_service.png)](http://badge.fury.io/rb/restpack_core_service)
 
-## Installation
+**Work In Progress**
 
-Add this line to your application's Gemfile:
+This gem provides services for managing Applications and Domains.
 
-    gem 'restpack_core_service'
+## Development Setup
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install restpack_core_service
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1. install postgres
+2. create a `restpack_core_service_test` database
+3. rake

data/lib/restpack_core_service/services/domain/by_identifier.rb

@@ -1,3 +1,5 @@
+require 'public_suffix'
+
 module RestPack::Core::Service::Commands::Domain
   class ByIdentifier < RestPack::Service::Command
     required do
@@ -9,15 +11,32 @@ module RestPack::Core::Service::Commands::Domain
     end
 
     def execute
-      result = Core::Serializers::DomainSerializer.resource(
-        inputs,
-        Core::Models::Domain.where(identifier: inputs[:identifier])
-      )
-
-      if result[:domains].any?
-        result
-      else
-        status :not_found
+      identifiers = [
+        inputs[:identifier],
+        get_domain(identifier)
+      ]
+
+      identifiers.reject(&:nil?).each do |identifier|
+        result = Core::Serializers::DomainSerializer.resource(
+          inputs,
+          Core::Models::Domain.where(identifier: identifier)
+        )
+
+        if result[:domains].any?
+          return result
+        end
+      end
+
+      status :not_found
+    end
+
+    private
+
+    def get_domain(identifier)
+      begin
+        PublicSuffix.parse(identifier).domain
+      rescue
+        nil
       end
     end
   end

data/lib/restpack_core_service/version.rb

@@ -1,7 +1,7 @@
 module RestPack
   module Core
     module Service
-      VERSION = "0.0.10"
+      VERSION = "0.0.11"
     end
   end
 end

data/restpack_core_service.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "restpack_service"
   spec.add_dependency "restpack_serializer"
   spec.add_dependency "restpack_gem"
+  spec.add_dependency "public_suffix",          "~> 1.3.1"
   spec.add_dependency "sinatra",                "~> 1.4.3"
   spec.add_dependency "pg",                     "~> 0.16"
 

data/spec/services/domain/by_identifier_spec.rb

@@ -29,6 +29,17 @@ describe Core::Commands::Domain::ByIdentifier do
       response.result[:applications].length.should == 1
       response.result[:applications].first[:id].should == @domain.application_id.to_s
     end
+
+    context 'with subdomain in identifier' do
+      let(:params) { {
+        identifier: "www.#{@domain.identifier}",
+        includes: 'applications'
+      } }
+
+      it 'is valid' do
+        response.success?.should == true
+      end
+    end
   end
 
   context 'with invalid :identifier' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_core_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-09-07 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restpack_service
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +201,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md