app_rail-airtable 0.2.4 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c9ba34b03585c9c61882bbc0427d731a9b8ad4176094a5e92ffd8bf3ff7adb
-  data.tar.gz: c9b0a34edb0a4fbcfb2c4d12d6d05fbaa368d31ca4506d28abda1bf95da783d3
+  metadata.gz: af89c3dbe402f9b53fc7c717de7c58d47fc8927e2388a21ca15d52464839a879
+  data.tar.gz: 74f42c9e64fe80c364d84c9b40ab7733a0d3bb597eb0f2b2d0c261673215cef8
 SHA512:
-  metadata.gz: 6943d74c4eb6cd81e3788b87f81650d5af4c7486f882f2ef0dcebafc7ad273ac01f44a95748a7d04de86155e8f794d55d0eaa26ca927168520e8af89a09835c7
-  data.tar.gz: 33d6a04b6e9dee379e8bffd1dab044b8feeab27c546ce22b93b6cc6d42a49c7cc3c2960791ad9ec630d9089676d116bc23968e018e4089db87fc84342717e798
+  metadata.gz: 859b5eb8d1de6589def9b76450087c13ab8a4b02d927a9210e69f620705c4ef096630e920a0deb201d194ba97feadb5437ec4e1d4f107fd0406aa132e37f8028
+  data.tar.gz: e4163e04b1e771930b6b338a28463a53b18678401f68285dda7342d66214f6f64b19c5be90f01ba891a01d51461100eacc7e3aa8918817b1710ba89815f9e844

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+.byebug_history

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    app_rail-airtable (0.2.4)
+    app_rail-airtable (0.2.8)
       activesupport
       airrecord
       sinatra
+      thor
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -31,7 +31,7 @@ You should create a model class for each table you want to use in your App. Mode
 To provide support for routes, models can implement
 * ar_list_item (index)
 * ar_stack (show)
-* self.create_from_params (create) 
+* self.create_as_json (create) 
     
 ### Servers
 You should create a single server which extends `AppRail::Airtable::Sinatra`, then add routes with the `resources` macro to add `index`, `show` and `create` routes. You can also provide your own routes.

data/app_rail-airtable.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'sinatra'
   spec.add_dependency 'airrecord'
+  spec.add_dependency 'thor'
   
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rack-test'

data/bin/ara_generator

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "bundler/setup"
-require 'app_rail/airtable'
+require 'app_rail/airtable/generator'
 require 'byebug'
 
 AppRail::Airtable::Generator.start(ARGV)

data/lib/app_rail/airtable/application_record.rb

@@ -43,7 +43,7 @@ module AppRail
       # Customisable behaviour
       
       # Override to provide custom sorting or filtering for index
-      def self.index
+      def self.index(user:)
         all
       end
       
@@ -55,7 +55,7 @@ module AppRail
       
       # size is either :small, :large or :full
       def image(name, index: 0, size: :full)
-        self[name][index]["thumbnails"][size.to_s]["url"]
+        self[name][index]["thumbnails"][size.to_s]["url"] if self[name] && self[name].length > index
       end
       
     end

data/lib/app_rail/airtable/generator.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext/string/inflections'
+require 'app_rail/airtable/string_ext'
 require 'thor'
 require 'airrecord'
-require 'app_rail/airtable/string_ext'
 
 module AppRail
   module Airtable

data/lib/app_rail/airtable/sinatra.rb

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'json'
 require 'active_support'
 
+# TODO: MBS - move to configure block or other
 Airrecord.api_key = ENV.fetch("AIRTABLE_API_KEY")
 
 class Symbol
@@ -23,24 +24,47 @@ end
 module AppRail
   module Airtable
     class Sinatra < Sinatra::Base
+      
+      helpers do
+        def request_body_as_json
+          request.body.rewind
+          JSON.parse(request.body.read)
+        end
+        
+        def params_and_json_body
+          request_body_as_json.merge(params)
+        end
+      end
 
-      def self.resources(name)
+      def self.resources(name, only: [:index, :show, :create], authenticated: false)
+        only = [only] if only.is_a?(Symbol)
+        
+        index_route(name, authenticated) if only.include?(:index)
+        show_route(name, authenticated) if only.include?(:show)
+        create_route(name, authenticated) if only.include?(:create)
+      end
+      
+      def self.index_route(name, authenticated)
         get "/#{name.to_s}" do
-          name.classify_constantize.index.map(&:ar_list_item_as_json).to_json
+          authenticate! if authenticated
+          name.classify_constantize.index(user: authenticated ? current_user : nil).map(&:ar_list_item_as_json).to_json
         end
-        
+      end
+      
+      def self.show_route(name, authenticated)
         get "/#{name.to_s}/:id" do
+          authenticate! if authenticated
           name.classify_constantize.find(params['id']).ar_stack_as_json.to_json
         end
-        
+      end
+      
+      def self.create_route(name, authenticated)
         post "/#{name.to_s}" do
-          request.body.rewind # in case someone already read it
-          data = JSON.parse(request.body.read)
-          new_record = name.classify_constantize.create_from_params(data.merge(params)) 
-          [201, {id: new_record.id}.to_json] 
+          authenticate! if authenticated
+          as_json = name.classify_constantize.create_as_json(current_user: authenticated ? current_user : nil, params: params_and_json_body)
+          [201, as_json.to_json] 
         end
       end
-
     end
   end
 end

data/lib/app_rail/airtable/version.rb

@@ -1,5 +1,5 @@
 module AppRail
   module Airtable
-    VERSION = "0.2.4"
+    VERSION = "0.2.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_rail-airtable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.8
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-19 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".DS_Store"
-- ".byebug_history"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"

data/.byebug_history

@@ -1,14 +0,0 @@
-exit
-@table_definitions.first.all.first.fields.keys
-@table_definitions.first.all.first.fields
-@table_definitions.first.all.first
-@table_definitions.first.first
-@table_definitions.first.instance_variable_get("@fields")
-@table_definitions.first.instance_variable_get("fields")
-@table_definitions.first.instance_variable_get("@fields")
-@table_definitions.first.fields
-@table_definitions.first.table_name
-@table_definitions.first.name
-@table_definitions.first.all
-@table_definitions.first
-@table_definitions