leif 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14358331d926739fcb9ddaf54f07ce82cec9dc0e
-  data.tar.gz: b3f7f28d1530a0c7b3ea479fad8fb9a221b861d0
+  metadata.gz: 9d21327777d65dd1e53077d2ee7f800dac2c93a6
+  data.tar.gz: ed6d1bf362b4eaa69bc2ddcc416f9164e7d5022d
 SHA512:
-  metadata.gz: e32dd3fef31bf00c8857688e647510e625ce6f77b5875fd1307ae9d10124ae4613985a98566be1ae6c2eb89d203fc50f236544f381dc34c0da8605d517eb841f
-  data.tar.gz: dd73d4a03a69ab51abed53c039e2dcc68af1b196f2f584525b693b02fdc21b2057d51d3e1c0003684be4ce2d0030598f31d1912533f9c14728cdef4e26e0e641
+  metadata.gz: 2f8e3aa4056db2da381cb4cad711ed3cc63868457b0cfc3fec1bdc93b98f730632d1a305d1d2868bdb21a769486e9d35c9ec9e1f5b12cfbe485283ec2e6393fc
+  data.tar.gz: 04cb8df37f9aa1cf0410ad4695fde9b601cbb841a4e7574cc639338eab634b2849fac3df64bf616fa5002a67030f3857dee7fcdb2e9ead4f5a4d1a66df3159cd

data/README.md

@@ -22,6 +22,8 @@ $ gem install gem-man
 $ gem man leif
 ```
 
+[manpage]: http://cloudapp.github.io/leif
+
 ## Interactive Commands
 
   - `root`:
@@ -79,35 +81,69 @@ $ gem man leif
 The UI is weak at this point and not very intuitive. To get started, here's a
 sample workflow. It should give you a general overview of what's possible.
 
+    $ leif
+    ...
+
+    -- Links --
+      account, authorization
+
     > follow authorization
+    ...
 
     > basic arthur@dent.com
     Password: *****
+    ...
+    {
+      "name": "token",
+      "value": "2c2p2B2Y0U3y3c2c"
+    },
+    ...
 
-    > token <token copied from response body>
+    > token 2c2p2B2Y0U3y3c2c
+    ...
+
+    -- Links --
+      drops, drops-template, stream, store
 
     > follow drops
-    > follow next
-    > follow first
+    ...
 
     > create
+    ...
+    Fill the template to create a new item.
+    name [null]: New Drop
+    private [null]: false
+    trash [false]:
+    bookmark_url [null]: http://getcloudapp.com
+    file_size [null]:
+    ...
+
+    > items
+    ...
+    Select this item [y,n]? y
+
+    -- Links --
+      collection, canonical, icon
+
+    > follow collection
+    ...
+
+    > items
+    ...
+    Select this item [y,n]? y
+    ...
 
-    Name (empty to submit): name
-    Value: CloudApp
-
-    Name (empty to submit): bookmark_url
-    Value: http://getcloudapp.com
-
-    Name (empty to submit):
-
-    > root
-    > follow drops
     > update
+    ...
+    Fill the template to update the item.
+    name ["New Drop"]: Updated Drop
+    private [false]:
+    trash [false]:
+    bookmark_url [null]:
+    file_size [null]:
+    ...
 
-    Name (empty to submit): name
-    Value: The Guide
-
-    Name (empty to submit):
-
-
-[manpage]: http://cloudapp.github.io/leif
+    > root
+    ...
+    -- Links --
+      drops, drops-template, account, stream

data/lib/leif/cli.rb

@@ -76,38 +76,29 @@ module Leif
       make_request subject.link_href(relation)
     end
 
-    def create_item
-      template = collection.template
-
-      loop do
-        print_template template, 'Create Item'
-        puts
-        puts 'Fill the template to create a new item.'
-        name = ask('Name (empty to submit): ')
-        break if name.empty?
-        value = ask_for_primitive('Value: ')
-
-        template = template.fill_field name, value
+    def fill_and_submit_template(template, label)
+      print_template template
+      puts
+      puts label
+      template.each do |name, value|
+        printed_value = value.inspect
+        printed_value = 'null' if printed_value == 'nil'
+        new_value = ask("#{name} [#{printed_value}]: ")
+        new_value = new_value.empty? ? value : convert_to_primitive(new_value)
+        template  = template.fill_field name, new_value
       end
 
       make_request template.href, template.convert_to_json, template.method
     end
 
-    def update(item)
-      template = collection.item_template item
-
-      loop do
-        print_template template, 'Update Item'
-        puts
-        puts 'Fill the template to update the item.'
-        name = ask('Name (empty to submit): ')
-        break if name.empty?
-        value = ask_for_primitive('Value: ')
-
-        template = template.fill_field name, value
-      end
+    def create_item
+      fill_and_submit_template collection.template,
+                               'Fill the template to create a new item.'
+    end
 
-      make_request template.href, template.convert_to_json, template.method
+    def update(item)
+      fill_and_submit_template collection.item_template(item),
+                               'Fill the template to update the item.'
     end
 
     def print_request
@@ -147,8 +138,8 @@ module Leif
       end
     end
 
-    def print_template(template = collection.template, label = 'Template')
-      banner label do |out|
+    def print_template(template = collection.template)
+      banner 'Template' do |out|
         out.print JSON.pretty_generate(template).lines
       end
     end
@@ -270,7 +261,6 @@ EOS
       when 'r', 'root'   then get_root
       when 'f', 'follow' then follow_link(collection, *args)
       when      'create' then create_item
-      when      'update' then update_item
 
       when 'request'     then print_request;    get_next_action
       when 'response'    then print_response;   get_next_action
@@ -301,12 +291,12 @@ EOS
       [ input.first, input[1..-1] ]
     end
 
-    def ask_for_primitive(message)
-      value = ask(message)
+    def convert_to_primitive(value)
       case value
-      when 'null', 'nil' then nil
-      when '"null"'      then 'null'
-      when '"nil"'       then 'nil'
+      when 'null', 'nil', '' then nil
+      when '"null"' then 'null'
+      when '"nil"'  then 'nil'
+      when '""'     then ''
 
       when 'true'    then true
       when 'false'   then false

data/lib/leif/collection_json.rb

@@ -47,6 +47,8 @@ module Leif
       end
 
       class Template < SimpleDelegator
+        include Enumerable
+
         attr_accessor :href, :method
 
         def initialize(template, href, method)
@@ -55,6 +57,10 @@ module Leif
           super template
         end
 
+        def each(&block)
+          convert_to_json.each(&block)
+        end
+
         def convert_to_json
           fetch('data').each_with_object({}) do |datum, json|
             json[datum['name']] = datum['value']

data/lib/leif/version.rb

@@ -1,3 +1,3 @@
 module Leif
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leif
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Larry Marburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday