freefeed-client 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d600de0410a6c2e6341267d64986af26b39add
-  data.tar.gz: 2c3b31d286d4b5cb477d38389b00306cb973540e
+  metadata.gz: 22b40faff7e8f35015ea4eafb279f5d6e8f7fe57
+  data.tar.gz: 1a20bc8d5471ea2871815496e6ec5f371d7107dc
 SHA512:
-  metadata.gz: a1aed947a23f1fcc9b9ae852841ecc72688455e0ae499cd504b05a510a823edf3cd0e0a762c8d5cad748673be74d0958824e5c0451628c5a6e4a2469eb81d174
-  data.tar.gz: 2f6299a90a0d4e7e783604d2c7d27f00fcc917ce9ac7f212c6303826231aa31727be25bcac965fe3bb4f134738a86bcd14d8f16a20deca7cd248c8a09a7a0e73
+  metadata.gz: c1518543888e251f82c382f63500b8b741fe01ef76f9dffb31f263d70ad11033159a443f9856ad31636f128252458b3fc6957c45c38b9632c56cdd53d82c9f73
+  data.tar.gz: 140e6030f65557cb10fe73a887e2aa3d9c23345bc459f878015490a77a921669d732cc7b2d7fd6b6711e91827e5e9db03e1f8f476b9c5ca4f0c0115fc2ad1bd6

data/README.md

@@ -2,7 +2,7 @@
 
 Ruby wrapper for [Freefeed API](https://fetsh.github.io/freefeed-api).
 
-[![Gem Version](https://badge.fury.io/rb/feefeed-client.svg)](http://badge.fury.io/rb/freefeed-client)
+[![Gem Version](https://badge.fury.io/rb/freefeed-client.svg)](https://badge.fury.io/rb/freefeed-client)
 
 ## Installation
 
@@ -44,12 +44,10 @@ post = Freefeed::Types::PostCreate.new(
   }
 )
 
-post_resource = Freefeed::Post.new(client: client)
-
-post_resource.create(post)
+Freefeed::Post.create(client, post)
 ```
 
-You can skip instantiating resource, but I'm not sure if this is a good practice:
+You can achive the same result without addressing `Freefeed::Post` class directly:
 
 ```ruby
 require 'freefeed'
@@ -67,10 +65,10 @@ post = Freefeed::Types::PostCreate.new(
   }
 )
 
-client.posts.create(post)
+client.posts_create(post)
 ```
 
-You can even skip instantiating post type, but you will lose some validation:
+You can even skip instantiating `PostCreate` type, but you will lose some validation:
 
 
 ```ruby
@@ -78,12 +76,12 @@ require 'freefeed'
 
 client = Freefeed::Client.new('yourFreefeedAPIToken')
 
-client.posts.create({post: {body: 'Hello World!'}, meta: {feeds: ['yourusername']}})
+client.posts_create({post: {body: 'Hello World!'}, meta: {feeds: ['yourusername']}})
 ```
 
 ## Logging
 
-By default, `freefeed-client` logs everything to STDOUT. You can change this behavior and provide your own logger class with someo ptions. See example below:
+By default, `freefeed-client` logs everything to STDOUT. You can change this behavior and provide your own logger class with some options. See example below:
 
 ```ruby
 client = Freefeed::Client.new(

data/lib/freefeed.rb

@@ -31,16 +31,16 @@ require 'freefeed/types/comment'
 require 'freefeed/types/post'
 
 ResourceKitling::Resource.subclasses.each do |sc|
-  mn = sc.to_s.downcase.split('::').last.pluralize
-  if Freefeed::Client.method_defined?(mn)
-    raise(
-      ArgumentError,
-      "Method '#{mn}' is already defined on Freefeed::Client"
-    )
-  end
-  Freefeed::Client.send(:define_method, mn) do
-    instance_variable_get("@#{mn}") || instance_variable_set(
-      "@#{mn}", sc.new(client: self)
-    )
+  sc.actions.each do |an|
+    mn = "#{sc.to_s.downcase.split('::').last.pluralize}_#{an.name}"
+    if Freefeed::Client.method_defined?(mn)
+      raise(
+        ArgumentError,
+        "Method '#{mn}' is already defined on Freefeed::Client"
+      )
+    end
+    Freefeed::Client.send(:define_method, mn) do |*args|
+      sc.create(self, *args)
+    end
   end
 end

data/lib/freefeed/client.rb

@@ -10,20 +10,11 @@ module Freefeed
     end
 
     def authenticate(username:, password:)
-      Session.new(client: self)
-             .create(username: username, password: password).tap do |re|
+      Session.create(self, username: username, password: password).tap do |re|
         @api_token = re.fetch('authToken')
       end
     end
 
-    def call(endpoint, params = {}, headers = {})
-      guard_wrong_endpoint(endpoint)
-      call!(
-        ENDPOINTS[endpoint][:method], path(endpoint),
-        build_options(endpoint, params), headers
-      )
-    end
-
     def call!(verb, endpoint, params = {}, headers = {})
       response = conn.send(
         verb, endpoint, params, auth_header.merge(headers)
@@ -47,29 +38,6 @@ module Freefeed
       end
     end
 
-    def guard_wrong_endpoint(endpoint)
-      raise Exceptions::WrongEndpoint unless ENDPOINTS.keys.include?(endpoint)
-    end
-
-    def build_options(endpoint, params)
-      default_params(endpoint).merge(sanitize_params(endpoint, params))
-    end
-
-    def path(endpoint)
-      (endpoint.start_with?('/') ? '' : BASE_PATH) + endpoint.split('#').first
-    end
-
-    def default_params(endpoint)
-      {}.merge(ENDPOINTS[endpoint][:default_params] || {})
-    end
-
-    def sanitize_params(endpoint, params)
-      return {} unless ENDPOINTS[endpoint][:params]
-      params.delete_if do |key, _|
-        !ENDPOINTS[endpoint][:params].include?(key.to_s)
-      end
-    end
-
     def handle_erros(response)
       raise(
         Exceptions::ResponseError.new(response),

data/lib/freefeed/types/comment.rb

@@ -3,14 +3,16 @@ require 'dry-struct'
 module Freefeed
   module Types
     class CommentCreate < Dry::Struct
-      attribute :comment, Types::Hash.schema(
-        body: Types::Body,
-        postId: Types::UID
-      )
+      attribute :comment do
+        attribute :body, Types::Body
+        attribute :postId, Types::UID
+      end
     end
 
     class CommentUpdate < Dry::Struct
-      attribute :comment, Types::Hash.schema(body: Types::Body)
+      attribute :comment do
+        attribute :body, Types::Body
+      end
     end
   end
 end

data/lib/freefeed/types/post.rb

@@ -3,22 +3,22 @@ require 'dry-struct'
 module Freefeed
   module Types
     class PostCreate < Dry::Struct
-      attribute :post, Types::Hash.schema(
-        body: Types::Body,
-        attachments: Types::Attachments.meta(omittable: true)
-      )
-      attribute :meta, Types::Hash.schema(
-        commentsDisabled: Types::Strict::Bool.default(false),
-        feeds: Types::AccountName | Types::Feeds
-      )
+      attribute :post do
+        attribute :body, Types::Body
+        attribute :attachments, Types::Attachments.meta(omittable: true)
+      end
+      attribute :meta do
+        attribute :commentsDisabled, Types::Strict::Bool.default(false)
+        attribute :feeds, Types::AccountName | Types::Feeds
+      end
     end
 
     class PostUpdate < Dry::Struct
-      attribute :post, Types::Hash.schema(
-        body: Types::Body.meta(omittable: true),
-        attachments: Types::Attachments.meta(omittable: true),
-        feeds: Types::Feeds.meta(omittable: true)
-      )
+      attribute :post do
+        attribute :body, Types::Body.meta(omittable: true)
+        attribute :attachments, Types::Attachments.meta(omittable: true)
+        attribute :feeds, Types::Feeds.meta(omittable: true)
+      end
     end
   end
 end

data/lib/freefeed/version.rb

@@ -1,3 +1,3 @@
 module Freefeed
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/resource_kitling.rb

@@ -2,7 +2,7 @@ module ResourceKitling
   require 'forwardable'
   class ActionCollection
     extend Forwardable
-    def_delegators :@collection, :find, :<<, :each, :include?
+    def_delegators :@collection, :find, :<<, :each, :include?, :map
     def initialize
       @collection = []
     end
@@ -46,6 +46,10 @@ module ResourceKitling
         np.gsub(":#{key}", value.to_s)
       end
     end
+
+    def to_s
+      name
+    end
   end
   class Resource
     class << self
@@ -62,16 +66,15 @@ module ResourceKitling
       self._actions ||= ActionCollection.new
       if block_given?
         self._actions.instance_eval(&block)
-        # MethodFactory.construct(self, self._actions)
         self._actions.each do |action|
-          if method_defined?(action.name)
+          if respond_to?(action.name.to_sym)
             raise(
               ArgumentError,
               "Action '#{action.name}' is already defined on `#{self}`"
             )
           end
           method_block = method_for_action(action)
-          send(:define_method, action.name, &method_block)
+          send(:define_singleton_method, action.name, &method_block)
         end
       end
       self._actions
@@ -79,6 +82,7 @@ module ResourceKitling
 
     def self.method_for_action(action)
       Proc.new do |*args|
+        client = args.shift
         pathopts = action.path.include?(':') ? args.shift : {}
         payload = args.shift
         payload = payload.to_h if payload.respond_to?(:to_h)
@@ -92,10 +96,7 @@ module ResourceKitling
       self.class.actions
     end
 
-    attr_reader :client
-
-    def initialize(client: nil)
-      @client = client
+    def initialize
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freefeed-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ilia Zemskov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday