usabilla_api 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b66214b5c6c7b4487f79a3cc60e5e7d5f586aa5
-  data.tar.gz: 3877f1cc54cc0ff5d6c26b89f83eaae54adbdc84
+  metadata.gz: bde5c38e7ba0c323dc9c9fa86dc028cc323b4b91
+  data.tar.gz: 5ceeebaaf4ecc546668e0c6f0fdee23e54689751
 SHA512:
-  metadata.gz: 54d8d0c1dfbb4536f785c47fc44b117bde9290202ab0b4a5c70343b70c38f916afe3cdc739e44fb7f601993ce4a4e215adfbdf1cd25a1fc066d558311d45cd6b
-  data.tar.gz: b03657d1f988807d8d1dfc22f98d09253dc57db71bed5e1c67bae03b220f80188f9358de64df3ac217b2c6a8e73d81d5620bc5a0544270b1a82125d07261c68a
+  metadata.gz: 14fee46edeeab42102c890c83a21f9d61c9ebe4abd467a71543e320d5ecb58123698b1572d93cc366749668e4aa5a51bd65e46597a010303edd80df41517953a
+  data.tar.gz: 4239637014011666c17737ab136e75fbb133d143f03205372822c94a2d8dd0ef8eba507193c4f2e7fdf68108ff3acb55f16ce9c94518358862f350084b62c947

data/CHANGELOG.md

@@ -3,6 +3,9 @@ Version History
     * All version update notes will be included here.
 ----
 
+* **2.0.0** Update to new Usabilla API Version(1.1.0). This includes a full refactor and integration change to the way requests will be made. Please consult the Readme
+        for more detailed information.
+* **1.1.2** Add Days Ago filter for 'days_ago' parameter to assist with generating a 'since' timestamp.
 * **1.1.1** Clean up JSON.parse.
 * **1.1.0** Removed json response flag as it is unnecessary for Rails/Sinatra integration. Simply adding .to_json on a proper json respond_to will yield the same results.
 * **1.0.1** Adjust Query String for proper routing.

data/README.md

@@ -27,28 +27,53 @@ Full Usabilla API documentation: [Usabilla API](https://usabilla.com/api)
 Simply add one of the following;
 (params = url query paramaters)
 
-To get the **buttons** api response
+####Apps API Requests
+**App**
 ```
-UsabillaApi.button.retrieve(params)
+UsabillaApi.apps_app.retrieve(params)
 ```
-To get the **buttons feedback** items api response
+**Feedback**
 ```
-UsabillaApi.button.feedback(params)
+UsabillaApi.apps_feedback.retrieve(params)
 ```
-To get the **campaign** api response
+
+####Email API Requests
+**Buttons**
+```
+UsabillaApi.email_button.retrieve(params)
+```
+**Feedback**
+```
+UsabillaApi.email_feedback.retrieve(params)
+```
+
+#### Websites API Requests
+**Buttons**
+```
+UsabillaApi.websites_button.retrieve(params)
 ```
-UsabillaApi.campaign.retrieve(params)
+**Feedback**
 ```
-To get the **campaign results** api response
+UsabillaApi.websites_feedback.retrieve(params)
 ```
-UsabillaApi.campaign.results(params)
+**Campaign**
+```
+UsabillaApi.websites_campaign.retrieve(params)
+```
+**Campaign Results**
+```
+UsabillaApi.websites_campaign_results.retrieve(params)
+```
+**Campaign Statistics**
+```
+UsabillaApi.websites_campaign_stats.retrieve(params)
 ```
 
 ######Example
 ```
 # Controller /button_controller.rb
 def show
-  @buttons = UsabillaApi.button(params)
+  @buttons = UsabillaApi.websites_button.retrieve(params)
 end
 ```
 ```
@@ -65,15 +90,18 @@ end
 
 Usabilla excepts the following query string parameters as values;
 
-Returns the requested subset.
+Returns the requested subset limit.
 ```
 ?limit=
 ```
-Returns the requested subset.
+Returns the requested subset since Unix Timestamps In Milliseconds.
 ```
 ?since= 
 ```
-Note: Only accepts Unix Timestamps
+Returns the requested subset of the days since this amount. (Overrides 'since' param)
+```
+?days_ago= 
+```
 
 #Contributing
 Feel free to fork or branch and create pull requests with any changes or cool additions!
@@ -82,7 +110,6 @@ Be sure to test any changes and include them in the pull request in order for it
 Thanks!
 
 
-######TODO
-* Refactoring
+######Updates
 
-*isn't this always the case though?* ~_^
+Please refer to the [Changelog](https://github.com/JMolinaro/usabilla_api/blob/master/CHANGELOG.md) for update information.

data/lib/usabilla_api/clients/apps/app.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Apps
+      class App
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_apps_app)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Apps::App::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/apps/feedback.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Apps
+      class Feedback
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_apps_feedback, true)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Apps::Feedback::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/email/button.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Email
+      class Button
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_email_button)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Email::Button::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/email/feedback.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Email
+      class Feedback
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_email_feedback, true)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Email::Feedback::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/websites/button.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Websites
+      class Button
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_websites_button)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Websites::Button::Item.new(item) } unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/websites/campaign.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Websites
+      class Campaign
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_websites_campaign)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Websites::Campaign::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/websites/campaign_results.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Websites
+      class CampaignResults
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_websites_campaign_results, true)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Websites::Campaign::Results::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/websites/campaign_stats.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Websites
+      class CampaignStats
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_websites_campaign_stats, true)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Websites::Campaign::Stats::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/clients/websites/feedback.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Clients
+    module Websites
+      class Feedback
+        class << self
+
+          def retrieve(params)
+            request = UsabillaApi.api_client.new(params).request(UsabillaApi.configuration.uri_websites_feedback, true)
+            response = UsabillaApi.response.new(request)
+            response.items = response.items.map {|item| UsabillaApi::Models::Websites::Feedback::Item.new(item)} unless response.items.nil?
+            response
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/config.rb

@@ -18,7 +18,7 @@ module UsabillaApi
       @http_method                  = 'GET'
       @host_protocol                = 'https://'
       @host                         = 'data.usabilla.com'
-      @base_scope                   = '/live/website'
+      @base_scope                   = '/live'
       @base_uri                     = @host_protocol + @host + @base_scope
       set_default_api_uris
       set_attr_accessors
@@ -28,10 +28,20 @@ module UsabillaApi
     #################################################################
 
     def set_default_api_uris
-      @uri_button                 ||= '/button'
-      @uri_feedback_items         ||= '/button/:id/feedback'
-      @uri_campaign               ||= '/campaign'
-      @uri_campaign_results       ||= '/campaign/:id/results'
+      # Apps
+      @uri_apps_app                       ||= '/apps'
+      @uri_apps_feedback                  ||= '/apps/:id/feedback'
+
+      # Email
+      @uri_email_button                   ||= '/email/button'
+      @uri_email_feedback                 ||= '/email/button/:id/feedback'
+
+      # Website
+      @uri_websites_button                ||= '/websites/button'
+      @uri_websites_feedback              ||= '/websites/button/:id/feedback'
+      @uri_websites_campaign              ||= '/websites/campaign'
+      @uri_websites_campaign_results      ||= '/websites/campaign/:id/results'
+      @uri_websites_campaign_stats        ||= '/websites/campaign/:id/stats'
     end
 
     def set_attr_accessors

data/lib/usabilla_api/convenience.rb

@@ -10,12 +10,40 @@ module UsabillaApi
         UsabillaApi::Models::Response
       end
 
-      def button
-        UsabillaApi::Clients::Button
+      def apps_app
+        UsabillaApi::Clients::Apps::App
       end
 
-      def campaign
-        UsabillaApi::Clients::Campaign
+      def apps_feedback
+        UsabillaApi::Clients::Apps::Feedback
+      end
+
+      def email_button
+        UsabillaApi::Clients::Email::Button
+      end
+
+      def email_feedback
+        UsabillaApi::Clients::Email::Feedback
+      end
+
+      def websites_button
+        UsabillaApi::Clients::Websites::Button
+      end
+
+      def websites_feedback
+        UsabillaApi::Clients::Websites::Feedback
+      end
+
+      def websites_campaign
+        UsabillaApi::Clients::Websites::Campaign
+      end
+
+      def websites_campaign_results
+        UsabillaApi::Clients::Websites::CampaignResults
+      end
+
+      def websites_campaign_stats
+        UsabillaApi::Clients::Websites::CampaignStats
       end
 
     end

data/lib/usabilla_api/models/apps/app/item.rb

@@ -0,0 +1,19 @@
+module UsabillaApi
+  module Models
+    module Apps
+      module App
+        class Item
+          attr_accessor :id, :name, :date, :status
+
+          def initialize(args = {})
+            @id             = args['id']      || ''
+            @name           = args['name']    || ''
+            @date           = args['date']    || ''
+            @status         = args['status']  || ''
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/apps/feedback/data.rb

@@ -0,0 +1,20 @@
+module UsabillaApi
+  module Models
+    module Apps
+      module Feedback
+        class Data
+          attr_accessor :name, :nps, :rating, :speed, :subject
+
+          def initialize(args = {})
+            @name       = args['name']      || ''
+            @nps        = args['nps']       || nil
+            @rating     = args['rating']    || nil
+            @speed      = args['speed']     || nil
+            @subject    = args['subject']   || ''
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/apps/feedback/geo_location.rb

@@ -0,0 +1,20 @@
+module UsabillaApi
+  module Models
+    module Apps
+      module Feedback
+        class GeoLocation
+          attr_accessor :city, :country, :lat, :lon, :region
+
+          def initialize(args = {})
+            @city      = args['city']      || ''
+            @country   = args['country']   || ''
+            @lat       = args['lat']       || nil
+            @lon       = args['lon']       || nil
+            @region    = args['region']    || ''
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/apps/feedback/item.rb

@@ -0,0 +1,51 @@
+module UsabillaApi
+  module Models
+    module Apps
+      module Feedback
+        class Item
+          attr_accessor :id, :date, :timestamp, :device_name, :data, :custom, :app_id, :app_name, :app_version, :os_name,
+                        :os_version, :location, :geo_location, :free_memory, :total_memory, :free_storage, :total_storage,
+                        :screenshot, :screensize, :connection, :ip_address, :language, :orientation, :battery_level, :rooted
+
+          def initialize(args = {})
+            @id               = args['id']                                || ''
+            @date             = args['date']                              || ''
+            @timestamp        = args['timestamp']                         || ''
+            @device_name       = args['deviceName']                        || ''
+            @data             = add_data(args['data'])                    || []
+            @custom           = args['custom']                            || []
+            @app_id           = args['appId']                             || ''
+            @app_name         = args['appName']                           || ''
+            @app_version      = args['appVersion']                        || ''
+            @os_name          = args['osName']                            || ''
+            @os_version       = args['osVersion']                         || ''
+            @location         = args['location']                          || ''
+            @geo_location     = add_geo_location(args['geoLocation'])     || []
+            @free_memory      = args['freeMemory']                        || nil
+            @total_memory     = args['totalMemory']                       || nil
+            @free_storage     = args['freeStorage']                       || nil
+            @total_storage    = args['totalStorage']                      || nil
+            @screenshot       = args['screenshot']                        || ''
+            @screensize       = args['screensize']                        || ''
+            @connection       = args['connection']                        || ''
+            @ip_address       = args['ipAddress']                         || ''
+            @language         = args['language']                          || ''
+            @orientation      = args['orientation']                       || ''
+            @battery_level    = args['batteryLevel']                      || nil
+            @rooted           = args['rooted']                            || false
+          end
+
+          private
+
+          def add_data(hash)
+            hash.map{ |group| UsabillaApi::Models::Apps::Feedback::Data.new(group) } unless hash.nil?
+          end
+          def add_geo_location(hash)
+            hash.map{ |group| UsabillaApi::Models::Apps::Feedback::GeoLocation.new(group) } unless hash.nil?
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/email/button/groups.rb

@@ -0,0 +1,18 @@
+module UsabillaApi
+  module Models
+    module Email
+      module Button
+        class Groups
+          attr_accessor :id, :active, :date, :name
+
+          def initialize(args = {})
+            @id         = args['id']          || ''
+            @active     = args['active']      || false
+            @date       = args['date']        || ''
+            @name       = args['name']        || ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/email/button/item.rb

@@ -0,0 +1,26 @@
+module UsabillaApi
+  module Models
+    module Email
+      module Button
+        class Item
+          attr_accessor :id, :date, :groups, :intro_text, :locale, :name
+
+          def initialize(args = {})
+            @id             = args['id']                  || ''
+            @date           = args['date']                || ''
+            @groups         = add_groups(args['groups'])  || {}
+            @intro_text     = args['introText']           || ''
+            @locale         = args['locale']              || ''
+            @name           = args['name']                || ''
+          end
+
+          private
+
+          def add_groups(hash)
+            hash.map{ |group| UsabillaApi::Models::Email::Button::Groups.new(group) } unless hash.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/email/feedback/item.rb

@@ -0,0 +1,29 @@
+module UsabillaApi
+  module Models
+    module Email
+      module Feedback
+        class Item
+          attr_accessor :id, :user_agent, :comment, :location, :date, :custom, :email, :labels, :nps,
+                        :public_url, :rating, :button_id, :tags, :url
+
+          def initialize(args = {})
+            @id             = args['id']          || ''
+            @user_agent     = args['userAgent']   || ''
+            @comment        = args['comment']     || ''
+            @location       = args['location']    || ''
+            @date           = args['date']        || nil
+            @custom         = args['custom']      || []
+            @email          = args['email']       || ''
+            @labels         = args['labels']      || []
+            @nps            = args['nps']         || nil
+            @public_url     = args['publicUrl']   || ''
+            @rating         = args['rating']      || nil
+            @button_id      = args['buttonId']    || ''
+            @tags           = args['tags']        || []
+            @url            = args['url']         || ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/websites/button/item.rb

@@ -0,0 +1,16 @@
+module UsabillaApi
+  module Models
+    module Websites
+      module Button
+        class Item
+          attr_accessor :id, :name
+
+          def initialize(args = {})
+            @id     = args['id']    || ''
+            @name   = args['name']  || ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/websites/campaign/item.rb

@@ -0,0 +1,22 @@
+module UsabillaApi
+  module Models
+    module Websites
+      module Campaign
+        class Item
+          attr_accessor :id, :date, :button_id, :analytics_id, :status, :name, :type
+
+          def initialize(args = {})
+            @id             = args['id']          || ''
+            @date           = args['date']        || ''
+            @button_id      = args['buttonId']    || ''
+            @analytics_id   = args['analyticsId'] || ''
+            @status         = args['status']      || ''
+            @name           = args['name']        || ''
+            @type           = args['type']        || ''
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/websites/campaign/results/item.rb

@@ -0,0 +1,27 @@
+module UsabillaApi
+  module Models
+    module Websites
+      module Campaign
+        module Results
+          class Item
+            attr_accessor :id, :user_agent, :location, :date, :campaign_id, :custom, :data, :url, :time
+
+            def initialize(args = {})
+              @id             = args['id']          || ''
+              @user_agent     = args['userAgent']   || ''
+              @location       = args['location']    || ''
+              @date           = args['date']        || ''
+              @campaign_id    = args['campaignId']  || ''
+              @custom         = args['custom']      || []
+              @data           = args['data']        || []
+              @url            = args['url']         || ''
+              @time           = args['time']        || nil
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/websites/campaign/stats/item.rb

@@ -0,0 +1,21 @@
+module UsabillaApi
+  module Models
+    module Websites
+      module Campaign
+        module Stats
+          class Item
+            attr_accessor :id, :completed, :conversion, :views
+
+            def initialize(args = {})
+              @id               = args['id']          || ''
+              @completed        = args['completed']   || nil
+              @conversion       = args['conversion']  || nil
+              @views            = args['views']       || nil
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/models/websites/feedback/item.rb

@@ -0,0 +1,30 @@
+module UsabillaApi
+  module Models
+    module Websites
+      module Feedback
+        class Item
+          attr_accessor :id, :user_agent, :comment, :location, :date, :custom, :email, :image, :labels, :nps, :public_url, :rating, :button_id, :tags, :url
+
+          def initialize(args = {})
+            @id             = args['id']          || ''
+            @user_agent     = args['userAgent']   || ''
+            @comment        = args['comment']     || ''
+            @location       = args['location']    || ''
+            @date           = args['date']        || ''
+            @custom         = args['custom']      || {}
+            @email          = args['email']       || ''
+            @image          = args['image']       || ''
+            @labels         = args['labels']      || []
+            @nps            = args['nps']         || nil
+            @public_url     = args['publicUrl']   || []
+            @rating         = args['rating']      || ''
+            @button_id      = args['buttonId']    || nil
+            @tags           = args['tags']        || []
+            @url            = args['url']         || ''
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/usabilla_api/usabilla_api.rb

@@ -21,39 +21,21 @@ module UsabillaApi
       @query_days_ago     = params['days_ago']  || nil
     end
 
-    def get_buttons
-      send_signed_request(UsabillaApi.configuration.uri_button)
-    end
-
-    def get_feedback_items
-      if @query_id.nil? || @query_id.empty?
-        raise 'Invalid Button ID'
-      end
-      uri = sub_query_id(UsabillaApi.configuration.uri_feedback_items)
-      send_signed_request(uri)
-    end
-
-    def get_campaigns
-      send_signed_request(UsabillaApi.configuration.uri_campaign)
-    end
-
-    def get_campaign_results
-      if @query_id.nil? || @query_id.empty?
-        raise 'Invalid Campaign ID'
-      end
-      uri = sub_query_id(UsabillaApi.configuration.uri_campaign_results)
-
-      send_signed_request(uri)
-    end
-
-    private
-
-    def send_signed_request(uri)
+    def request(uri, require_id=false)
+      base_uri = uri
 
       if @access_key.nil? || @secret_key.nil?
         raise 'The Access Key or Secret Key supplied is invalid.'
       end
 
+      if require_id
+        if @query_id.nil? || @query_id.empty?
+          raise 'Invalid ID Parameter'
+        else
+          base_uri = sub_query_id(uri)
+        end
+      end
+
       t = DateTime.now
       usbldate = t.strftime('%a, %d %b %Y %H:%M:%S GMT')
       datestamp = t.strftime('%Y%m%d')  # Date w/o time, used in credential scope
@@ -64,7 +46,7 @@ module UsabillaApi
       signed_headers = 'date;host'
       payload_hash = OpenSSL::Digest::SHA256.new.hexdigest
 
-      canonical_request = "#{@http_method}\n#{@base_scope + uri}\n#{query_string}\n#{canonical_headers}\n#{signed_headers}\n#{payload_hash}"
+      canonical_request = "#{@http_method}\n#{@base_scope + base_uri}\n#{query_string}\n#{canonical_headers}\n#{signed_headers}\n#{payload_hash}"
 
       canonical_request_digest = OpenSSL::Digest::SHA256.new(canonical_request).hexdigest
       algorithm = 'USBL1-HMAC-SHA256'
@@ -79,7 +61,7 @@ module UsabillaApi
       headers = {'date' => usbldate, 'Authorization' => authorization_header}
 
       # Send the request.
-      request_url = uri + '?' + query_string
+      request_url = base_uri + '?' + query_string
       response = JSON.parse(RestClient.get(UsabillaApi.configuration.base_uri + request_url, headers))
 
       # Return Response
@@ -87,6 +69,8 @@ module UsabillaApi
 
     end
 
+    private
+
     def get_signature_key(key, long_date)
       k_date    = OpenSSL::HMAC.digest('sha256', 'USBL1' + key, long_date)
       k_signing = OpenSSL::HMAC.digest('sha256', k_date, 'usbl1_request')

data/lib/usabilla_api/version.rb

@@ -1,3 +1,3 @@
 module UsabillaApi
-  VERSION = '1.1.2'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usabilla_api
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Molinaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -148,16 +148,30 @@ files:
 - CHANGELOG.md
 - README.md
 - lib/usabilla_api.rb
-- lib/usabilla_api/clients/button.rb
-- lib/usabilla_api/clients/campaign.rb
+- lib/usabilla_api/clients/apps/app.rb
+- lib/usabilla_api/clients/apps/feedback.rb
+- lib/usabilla_api/clients/email/button.rb
+- lib/usabilla_api/clients/email/feedback.rb
+- lib/usabilla_api/clients/websites/button.rb
+- lib/usabilla_api/clients/websites/campaign.rb
+- lib/usabilla_api/clients/websites/campaign_results.rb
+- lib/usabilla_api/clients/websites/campaign_stats.rb
+- lib/usabilla_api/clients/websites/feedback.rb
 - lib/usabilla_api/config.rb
 - lib/usabilla_api/convenience.rb
-- lib/usabilla_api/models/button/item.rb
-- lib/usabilla_api/models/campaign/item.rb
-- lib/usabilla_api/models/campaign/statistics.rb
-- lib/usabilla_api/models/campaign_results/item.rb
-- lib/usabilla_api/models/feedback/item.rb
+- lib/usabilla_api/models/apps/app/item.rb
+- lib/usabilla_api/models/apps/feedback/data.rb
+- lib/usabilla_api/models/apps/feedback/geo_location.rb
+- lib/usabilla_api/models/apps/feedback/item.rb
+- lib/usabilla_api/models/email/button/groups.rb
+- lib/usabilla_api/models/email/button/item.rb
+- lib/usabilla_api/models/email/feedback/item.rb
 - lib/usabilla_api/models/response.rb
+- lib/usabilla_api/models/websites/button/item.rb
+- lib/usabilla_api/models/websites/campaign/item.rb
+- lib/usabilla_api/models/websites/campaign/results/item.rb
+- lib/usabilla_api/models/websites/campaign/stats/item.rb
+- lib/usabilla_api/models/websites/feedback/item.rb
 - lib/usabilla_api/usabilla_api.rb
 - lib/usabilla_api/version.rb
 homepage: http://rubygems.org/gems/usabilla_api

data/lib/usabilla_api/clients/button.rb

@@ -1,23 +0,0 @@
-module UsabillaApi
-  module Clients
-    class Button
-      class << self
-
-        def retrieve(params)
-          request = UsabillaApi.api_client.new(params).get_buttons
-          response = UsabillaApi.response.new(request)
-          response.items = response.items.map {|item| UsabillaApi::Models::Button::Item.new(item)} unless response.items.nil?
-          response
-        end
-
-        def feedback(params)
-          request = UsabillaApi.api_client.new(params).get_feedback_items
-          response = UsabillaApi.response.new(request)
-          response.items = response.items.map {|item| UsabillaApi::Models::Feedback::Item.new(item)} unless response.items.nil?
-          response
-        end
-
-      end
-    end
-  end
-end

data/lib/usabilla_api/clients/campaign.rb

@@ -1,23 +0,0 @@
-module UsabillaApi
-  module Clients
-    class Campaign
-      class << self
-
-        def retrieve(params)
-          request = UsabillaApi.api_client.new(params).get_campaigns
-          response = UsabillaApi.response.new(request)
-          response.items = response.items.map {|item| UsabillaApi::Models::Campaign::Item.new(item)} unless response.items.nil?
-          response
-        end
-
-        def results(params)
-          request = UsabillaApi.api_client.new(params).get_campaign_results
-          response = UsabillaApi.response.new(request)
-          response.items = response.items.map {|item| UsabillaApi::Models::CampaignResults::Item.new(item)} unless response.items.nil?
-          response
-        end
-
-      end
-    end
-  end
-end

data/lib/usabilla_api/models/button/item.rb

@@ -1,15 +0,0 @@
-module UsabillaApi
-  module Models
-    module Button
-      class Item
-        attr_accessor :id, :name
-
-        def initialize(args = {})
-          @id             = args['id'] || ''
-          @name           = args['name'] || ''
-        end
-
-      end
-    end
-  end
-end

data/lib/usabilla_api/models/campaign/item.rb

@@ -1,24 +0,0 @@
-module UsabillaApi
-  module Models
-    module Campaign
-      class Item
-        attr_accessor :id, :date, :button_id, :analytics_id, :status, :name, :statistics, :type
-
-        def initialize(args = {})
-          @id             = args['id'] || ''
-          @date           = args['date'] || ''
-          @button_id      = args['buttonId'] || ''
-          @analytics_id   = args['analyticsId'] || ''
-          @status         = args['status'] || ''
-          @name           = args['name'] || ''
-          @statistics     = create_statistics(args['statistics']) || []
-          @type           = args['type'] || ''
-        end
-
-        def create_statistics(hash)
-          UsabillaApi::Models::Campaign::Statistics.new(hash)
-        end
-      end
-    end
-  end
-end

data/lib/usabilla_api/models/campaign/statistics.rb

@@ -1,17 +0,0 @@
-module UsabillaApi
-  module Models
-    module Campaign
-      class Statistics
-
-        attr_accessor :views, :completed, :conversion
-
-        def initialize(args = {})
-          @views            = args['views'] || nil
-          @completed        = args['completed'] || nil
-          @conversion       = args['conversion'] || nil
-        end
-
-      end
-    end
-  end
-end

data/lib/usabilla_api/models/campaign_results/item.rb

@@ -1,22 +0,0 @@
-module UsabillaApi
-  module Models
-    module CampaignResults
-      class Item
-        attr_accessor :id, :user_agent, :location, :date, :campaign_id, :custom_data, :data, :url, :time
-
-        def initialize(args = {})
-          @id             = args['id'] || ''
-          @user_agent     = args['userAgent'] || ''
-          @location       = args['location'] || ''
-          @date           = args['date'] || ''
-          @campaign_id    = args['campaignId'] || ''
-          @custom_data    = args['customData'] || []
-          @data           = args['data'] || []
-          @url            = args['url'] || ''
-          @time           = args['time'] || nil
-        end
-
-      end
-    end
-  end
-end

data/lib/usabilla_api/models/feedback/item.rb

@@ -1,28 +0,0 @@
-module UsabillaApi
-  module Models
-    module Feedback
-      class Item
-        attr_accessor :id, :user_agent, :comment, :location, :date, :custom, :email, :image, :labels, :nps, :public_url, :rating, :button_id, :tags, :url
-
-        def initialize(args = {})
-          @id             = args['id'] || ''
-          @user_agent     = args['userAgent'] || ''
-          @comment        = args['comment'] || ''
-          @location       = args['location'] || ''
-          @date           = args['date'] || ''
-          @custom         = args['custom'] || []
-          @email          = args['email'] || ''
-          @image          = args['image'] || ''
-          @labels         = args['labels'] || []
-          @nps            = args['nps'] || nil
-          @public_url     = args['publicUrl'] || []
-          @rating         = args['rating'] || ''
-          @button_id      = args['buttonId'] || nil
-          @tags           = args['tags'] || []
-          @url            = args['url'] || ''
-        end
-
-      end
-    end
-  end
-end